Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3)

Unified Diff: third_party/modp_b64/modp_b64_data.h

Issue 3044045: Add an #ifndef to modp_b64_data.h to avoid a typedef conflict that certain... (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 10 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/modp_b64/README.chromium ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/modp_b64/modp_b64_data.h
===================================================================
--- third_party/modp_b64/modp_b64_data.h (revision 54936)
+++ third_party/modp_b64/modp_b64_data.h (working copy)
@@ -1,6 +1,14 @@
+#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 '/'
« no previous file with comments | « third_party/modp_b64/README.chromium ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698