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

Unified Diff: nss/mozilla/nsprpub/pr/include/prtypes.h

Issue 3135002: Update to NSS 3.12.7 and NSPR 4.8.6.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/
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
Index: nss/mozilla/nsprpub/pr/include/prtypes.h
===================================================================
--- nss/mozilla/nsprpub/pr/include/prtypes.h (revision 55475)
+++ nss/mozilla/nsprpub/pr/include/prtypes.h (working copy)
@@ -435,7 +435,7 @@
** for storing a pointer or pointer sutraction.
************************************************************************/
#ifdef _WIN64
-typedef unsigned __int64 PRUptrdiff;
+typedef PRUint64 PRUptrdiff;
#else
typedef unsigned long PRUptrdiff;
#endif
@@ -487,8 +487,8 @@
** http://java.sun.com/docs/books/vmspec/index.html.)
*/
#ifdef _WIN64
-typedef __int64 PRWord;
-typedef unsigned __int64 PRUword;
+typedef PRInt64 PRWord;
+typedef PRUint64 PRUword;
#else
typedef long PRWord;
typedef unsigned long PRUword;
@@ -535,6 +535,14 @@
/********* ????????????? End Fix me ?????????????????????????????? *****/
#endif /* NO_NSPR_10_SUPPORT */
+/*
+** Compile-time assert. "condition" must be a constant expression.
+** The macro can be used only in places where an "extern" declaration is
+** allowed.
+*/
+#define PR_STATIC_ASSERT(condition) \
+ extern void pr_static_assert(int arg[(condition) ? 1 : -1])
+
PR_END_EXTERN_C
#endif /* prtypes_h___ */

Powered by Google App Engine
This is Rietveld 408576698