From 0fa40f9e413c7f69ddd6d277280e5dda812da63c Mon Sep 17 00:00:00 2001 From: "waterson%netscape.com" Date: Thu, 27 Apr 2000 06:50:38 +0000 Subject: [PATCH] Oops. Didn't realize nscore.h was included in 'C' compilation as well. Wrap namespace baloney with #ifdef __cplusplus__. r=scc --- xpcom/base/nscore.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xpcom/base/nscore.h b/xpcom/base/nscore.h index 3b23b0760a97..951c81371c9b 100644 --- a/xpcom/base/nscore.h +++ b/xpcom/base/nscore.h @@ -206,9 +206,10 @@ typedef PRUint16 PRUnichar; // !=, >, >=, and <= based on == and <. VC++ chooses to put these in // a special namespace. We'll make it seem like they're *not* in a // special namespace. + #ifdef __cplusplus__ namespace std { namespace rel_ops {} } using namespace std::rel_ops; - + #endif /* VC++ is special and doesn't use naked min() and max() */ #undef NS_MIN