diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/pool.h
--- a/src/server/util/pool.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/pool.h	Thu Feb 23 13:10:04 2012 +0100
@@ -55,7 +55,7 @@
 #ifndef NETSITE_H
 //include "netsite.h"
 #include "../public/nsapi.h"
-#include "nspr.h"
+//include "nspr.h"
 #endif /* !NETSITE_H */
 
 #ifndef BASE_PBLOCK_H
@@ -74,7 +74,9 @@
 
 #ifdef INTNSAPI
 
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 NSAPI_PUBLIC int INTpool_init(pblock *pb, Session *sn, Request *rq);
 
@@ -109,7 +111,9 @@
 NSAPI_PUBLIC void INTpool_assert(pool_handle_t *pool_handle, const void *ptr);
 #endif
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 #define pool_init INTpool_init