diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/shexp.h
--- a/src/server/util/shexp.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/shexp.h	Thu Feb 23 13:10:04 2012 +0100
@@ -104,7 +104,9 @@
 
 #ifdef INTNSAPI
 
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 NSAPI_PUBLIC int INTshexp_valid(const char *exp);
 
@@ -116,7 +118,9 @@
 
 NSAPI_PUBLIC int INTshexp_casecmp(const char *str, const char *exp);
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 /* --- End function prototypes --- */