Add an #ifndef to modp_b64_data.h to avoid a typedef conflict that certain...

third_party/modp_b64/modp_b64_data.h

+#include "build/build_config.h"
+#if !defined(COMPILER_MSVC)
+#include <stdint.h>
+#else
+// VC8 doesn't have stdint.h.  On the other hand, some compilers don't like
+// the below code, because basictypes.h itself includes stdint.h and the
+// typedefs below can cause conflicts.
 #include "base/basictypes.h"
 typedef uint8 uint8_t;
 typedef uint32 uint32_t;
+#endif
 
 #define CHAR62 '+'
 #define CHAR63 '/'
 #define CHARPAD '='
 static const char e0[256] = {
  'A',  'A',  'A',  'A',  'B',  'B',  'B',  'B',  'C',  'C',
  'C',  'C',  'D',  'D',  'D',  'D',  'E',  'E',  'E',  'E',
  'F',  'F',  'F',  'F',  'G',  'G',  'G',  'G',  'H',  'H',
  'H',  'H',  'I',  'I',  'I',  'I',  'J',  'J',  'J',  'J',
  'K',  'K',  'K',  'K',  'L',  'L',  'L',  'L',  'M',  'M',
@@ skipping 460 matching lines @@
 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff,
 0x01ffffff, 0x01ffffff, 0x01ffffff, 0x01ffffff
 };
 
 
 #endif