diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/systhr.h
--- a/src/server/util/systhr.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/systhr.h	Thu Feb 23 13:10:04 2012 +0100
@@ -58,7 +58,9 @@
 #define INTNSAPI
 #ifdef INTNSAPI
 
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 NSAPI_PUBLIC
 SYS_THREAD INTsysthread_start(int prio, int stksz, thrstartfunc fn, void *arg);
@@ -88,7 +90,9 @@
 NSAPI_PUBLIC 
 void INTsysthread_set_default_stacksize(unsigned long size);
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 /* --- End function prototypes --- */