diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/util.h
--- a/src/server/util/util.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/util.h	Thu Feb 23 13:10:04 2012 +0100
@@ -70,7 +70,9 @@
 
 #ifdef INTNSAPI
 
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 NSAPI_PUBLIC
 int INTutil_init_PRNetAddr(PRNetAddr * naddr, char * ipstr, int iplen, int type);
@@ -146,7 +148,7 @@
 
 NSAPI_PUBLIC int INTutil_itoa(int i, char *a);
 
-NSAPI_PUBLIC int INTutil_i64toa(PRInt64 i, char *a);
+NSAPI_PUBLIC int INTutil_i64toa(int64_t i, char *a);
 
 
 NSAPI_PUBLIC
@@ -186,7 +188,9 @@
 NSAPI_PUBLIC PRBool INTutil_format_http_version(const char *v, int *protv_num, char *buffer, int size);
 
 NSAPI_PUBLIC int INTutil_getboolean(const char *v, int def);
-NSAPI_PUBLIC PRIntervalTime INTutil_getinterval(const char *v, PRIntervalTime def);
+
+// TODO
+//NSAPI_PUBLIC PRIntervalTime INTutil_getinterval(const char *v, PRIntervalTime def);
 
 #ifdef NEED_STRCASECMP
 NSAPI_PUBLIC int INTutil_strcasecmp(const char *one, const char *two);
@@ -210,7 +214,7 @@
 
 NSAPI_PUBLIC char *util_decrement_string(char *s);
 
-NSAPI_PUBLIC PRInt64 util_atoi64(const char *a);
+NSAPI_PUBLIC int64_t util_atoi64(const char *a);
 
 NSAPI_PUBLIC char *util_html_escape(const char *s);
 
@@ -249,7 +253,9 @@
 
 /* --- End Windows-only function prototypes --- */
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 #ifdef __cplusplus