Bug 566869 - prefapi.h does not like Chromium's prtypes.h. r=bsmedberg
authorFrederic Plourde <bugzillaFred@gmail.com>
Tue, 25 May 2010 17:13:47 -0700
changeset 46880 216fccb29929f888038c8bce988e77b2c1c90f60
parent 46879 dd7db0a478db5576885dfb32db50d78d2d526faa
child 46881 90fa3f90c0f736468dd32be958c9b3018f2c0073
push id14210
push userdougt@mozilla.com
push dateThu, 01 Jul 2010 06:28:42 +0000
treeherdermozilla-central@3aff97777291 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs566869
milestone1.9.3a5pre
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
Bug 566869 - prefapi.h does not like Chromium's prtypes.h. r=bsmedberg
modules/libpref/src/prefapi.h
modules/libpref/src/prefread.h
--- a/modules/libpref/src/prefapi.h
+++ b/modules/libpref/src/prefapi.h
@@ -39,17 +39,17 @@
 // <pre>
 */
 #ifndef PREFAPI_H
 #define PREFAPI_H
 
 #include "nscore.h"
 #include "pldhash.h"
 
-NSPR_BEGIN_EXTERN_C
+PR_BEGIN_EXTERN_C
 
 typedef union
 {
     char*       stringVal;
     PRInt32     intVal;
     PRBool      boolVal;
 } PrefValue;
 
@@ -204,10 +204,10 @@ nsresult PREF_UnregisterCallback( const 
  * Used by nsPrefService as the callback function of the 'pref' parser
  */
 void PREF_ReaderCallback( void *closure,
                           const char *pref,
                           PrefValue   value,
                           PrefType    type,
                           PRBool      isDefault);
 
-NSPR_END_EXTERN_C
+PR_END_EXTERN_C
 #endif
--- a/modules/libpref/src/prefread.h
+++ b/modules/libpref/src/prefread.h
@@ -35,17 +35,17 @@
  * ***** END LICENSE BLOCK ***** */
 
 #ifndef prefread_h__
 #define prefread_h__
 
 #include "prtypes.h"
 #include "prefapi.h"
 
-NSPR_BEGIN_EXTERN_C
+PR_BEGIN_EXTERN_C
 
 /**
  * Callback function used to notify consumer of preference name value pairs.
  * The pref name and value must be copied by the implementor of the callback
  * if they are needed beyond the scope of the callback function.
  *
  * @param closure
  *        user data passed to PREF_InitParseState
@@ -124,10 +124,10 @@ void PREF_FinalizeParseState(PrefParseSt
  *        Raw buffer containing data to be parsed.
  * @param bufLen
  *        Length of buffer.
  *
  * @return PR_FALSE if buffer contains malformed content.
  */
 PRBool PREF_ParseBuf(PrefParseState *ps, const char *buf, int bufLen);
 
-NSPR_END_EXTERN_C
+PR_END_EXTERN_C
 #endif /* prefread_h__ */