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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: webrtc/base/nssidentity.h

Issue 1362503003: Use suffixed {uint,int}{8,16,32,64}_t types. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: google::int32 Created 5 years, 3 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
« webrtc/base/basictypes_unittest.cc ('K') | « webrtc/base/network.cc ('k') | webrtc/base/nssstreamadapter.h » ('j') | webrtc/modules/audio_processing/test/unpack.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/base/nssidentity.h
diff --git a/webrtc/base/nssidentity.h b/webrtc/base/nssidentity.h
index a28ce62ba16469e305e2aa5b167de05fe7c06cd6..72cba7c7ca2d1f857a5cb17778b1e0a3ce807e23 100644
--- a/webrtc/base/nssidentity.h
+++ b/webrtc/base/nssidentity.h
@@ -13,13 +13,14 @@
#include <string>
-// Hack: Define+undefine int64 and uint64 to avoid typedef conflict with NSS.
+// Hack: Define+undefine int64_t and uint64_t to avoid typedef conflict with
+// NSS.
// TODO(kjellander): Remove when webrtc:4497 is completed.
-#define uint64 foo_uint64
-#define int64 foo_int64
+#define uint64_t foo_uint64
+#define int64_t foo_int64
#include "cert.h"
-#undef uint64
-#undef int64
+#undef uint64_t
+#undef int64_t
#include "nspr.h"
#include "hasht.h"
#include "keythi.h"
« webrtc/base/basictypes_unittest.cc ('K') | « webrtc/base/network.cc ('k') | webrtc/base/nssstreamadapter.h » ('j') | webrtc/modules/audio_processing/test/unpack.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698