diff -r a2c8fc23c90e -r 1a7853a4257e src/server/util/pblock.h
--- a/src/server/util/pblock.h	Wed Feb 22 23:20:39 2012 +0100
+++ b/src/server/util/pblock.h	Thu Feb 23 13:10:04 2012 +0100
@@ -71,7 +71,9 @@
 
 /* --- Begin function prototypes --- */
 
-NSPR_BEGIN_EXTERN_C
+#ifdef	__cplusplus
+extern "C" {
+#endif
 
 NSAPI_PUBLIC pb_param *INTparam_create(const char *name, const char *value);
 
@@ -332,7 +334,7 @@
 
 NSAPI_PUBLIC pb_param *pblock_kninsert(const pb_key *key, int value, pblock *pb);
 
-NSAPI_PUBLIC pb_param *pblock_kllinsert(const pb_key *key, PRInt64 value, pblock *pb);
+NSAPI_PUBLIC pb_param *pblock_kllinsert(const pb_key *key, int64_t value, pblock *pb);
 
 #ifdef __cplusplus
 inline const pb_key *param_key(pb_param *pp)
@@ -343,7 +345,9 @@
 
 #define PARAM_KEY(pp) *(const pb_key **)(pp + 1) /* new */
 
-NSPR_END_EXTERN_C
+#ifdef	__cplusplus
+}
+#endif
 
 #define param_create INTparam_create
 #define param_free INTparam_free