diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/ereport.h
--- a/src/server/util/ereport.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/ereport.h	Thu Feb 23 13:10:04 2012 +0100
@@ -44,6 +44,8 @@
  * Rob McCool
  */
 
+//TODO: include netsite.h or systems.h
+
 #ifndef BASE_SESSION_H
 #include "../daemon/session.h"
 #endif /* !BASE_SESSION_H */
@@ -59,7 +61,9 @@
 
 #ifdef INTNSAPI
 
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 /*
  * INTereport logs an error of the given degree and formats the arguments with 
@@ -84,7 +88,9 @@
 /* For restarts */
 NSAPI_PUBLIC SYS_FILE INTereport_getfd(void);
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 #ifdef __cplusplus
 class EreportableException;