Revert 203025 "Make the copy of GURL in src/url buildable as a c..."

trunk/src/url/url_canon_internal.h

Index: trunk/src/url/url_canon_internal.h
===================================================================
--- trunk/src/url/url_canon_internal.h	(revision 203026)
+++ trunk/src/url/url_canon_internal.h	(working copy)
@@ -83,7 +83,7 @@
 
 // Maps the hex numerical values 0x0 to 0xf to the corresponding ASCII digit
 // that will be used to represent it.
-URL_EXPORT extern const char kHexCharLookup[0x10];
+extern const char kHexCharLookup[0x10];
 
 // This lookup table allows fast conversion between ASCII hex letters and their
 // corresponding numerical value. The 8-bit range is divided up into 8
@@ -150,8 +150,8 @@
 // (for a single-byte ASCII character, it will not be changed).
 //
 // Implementation is in url_canon_icu.cc.
-URL_EXPORT bool ReadUTFChar(const char* str, int* begin, int length,
-                            unsigned* code_point_out);
+bool ReadUTFChar(const char* str, int* begin, int length,
+                 unsigned* code_point_out);
 
 // Generic To-UTF-8 converter. This will call the given append method for each
 // character that should be appended, with the given output method. Wrappers
@@ -227,8 +227,8 @@
 // (for a single-16-bit-word character, it will not be changed).
 //
 // Implementation is in url_canon_icu.cc.
-URL_EXPORT bool ReadUTFChar(const char16* str, int* begin, int length,
-                            unsigned* code_point);
+bool ReadUTFChar(const char16* str, int* begin, int length,
+                 unsigned* code_point);
 
 // Equivalent to U16_APPEND_UNSAFE in ICU but uses our output method.
 inline void AppendUTF16Value(unsigned code_point,
@@ -346,10 +346,10 @@
 // replacing the invalid characters with the "invalid character". It will
 // return false in the failure case, and the caller should not continue as
 // normal.
-URL_EXPORT bool ConvertUTF16ToUTF8(const char16* input, int input_len,
-                                   CanonOutput* output);
-URL_EXPORT bool ConvertUTF8ToUTF16(const char* input, int input_len,
-                                   CanonOutputT<char16>* output);
+bool ConvertUTF16ToUTF8(const char16* input, int input_len,
+                        CanonOutput* output);
+bool ConvertUTF8ToUTF16(const char* input, int input_len,
+                        CanonOutputT<char16>* output);
 
 // Converts from UTF-16 to 8-bit using the character set converter. If the
 // converter is NULL, this will use UTF-8.
@@ -408,10 +408,9 @@
 #ifndef WIN32
 
 // Implementations of Windows' int-to-string conversions
-URL_EXPORT int _itoa_s(int value, char* buffer, size_t size_in_chars,
-                       int radix);
-URL_EXPORT int _itow_s(int value, char16* buffer, size_t size_in_chars,
-                       int radix);
+int _itoa_s(int value, char* buffer, size_t size_in_chars, int radix);
+int _itow_s(int value, char16* buffer, size_t size_in_chars,
+            int radix);
 
 // Secure template overloads for these functions
 template<size_t N>