From db024defafb81f09ad0184ee87a6bce9754da9de Mon Sep 17 00:00:00 2001 From: "ted.mielczarek%gmail.com" Date: Mon, 15 Mar 2010 17:53:44 +0000 Subject: [PATCH] bug 551782 - move PR_STATIC_ASSERT from prlog.h to prtypes.h. Patch by Zack Weinberg , r=me git-svn-id: svn://10.0.0.236/trunk@259988 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/pr/include/prlog.h | 8 -------- mozilla/nsprpub/pr/include/prtypes.h | 8 ++++++++ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/nsprpub/pr/include/prlog.h b/mozilla/nsprpub/pr/include/prlog.h index c5f6c62275d..d2ca5d71526 100644 --- a/mozilla/nsprpub/pr/include/prlog.h +++ b/mozilla/nsprpub/pr/include/prlog.h @@ -248,14 +248,6 @@ NSPR_API(void) PR_Assert(const char *s, const char *file, PRIntn ln); #endif /* defined(DEBUG) || defined(FORCE_PR_ASSERT) */ -/* -** 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 /* prlog_h___ */ diff --git a/mozilla/nsprpub/pr/include/prtypes.h b/mozilla/nsprpub/pr/include/prtypes.h index dd66d0f5950..fcebc44517a 100644 --- a/mozilla/nsprpub/pr/include/prtypes.h +++ b/mozilla/nsprpub/pr/include/prtypes.h @@ -519,6 +519,14 @@ typedef unsigned long PRUword; /********* ????????????? 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___ */