Backout the dbm/ portions of bug 795507 because that code is a read-only copy from the upstream NSS project
authorEhsan Akhgari <ehsan@mozilla.com>
Tue, 09 Oct 2012 16:38:15 -0400
changeset 109783 830fccc0509c2518dc8c7eb8a2fc68c33583420a
parent 109782 32465392370a310fbeb6b0432dfe1bf0c9147744
child 109784 4210c1f677e5985bc2ee79344ce7fd0ebb5d2ab3
push id16198
push usereakhgari@mozilla.com
push dateTue, 09 Oct 2012 20:38:25 +0000
treeherdermozilla-inbound@830fccc0509c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs795507
milestone19.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout the dbm/ portions of bug 795507 because that code is a read-only copy from the upstream NSS project
dbm/include/mcom_db.h
--- a/dbm/include/mcom_db.h
+++ b/dbm/include/mcom_db.h
@@ -201,23 +201,19 @@
 #endif
 #endif
 
 #ifdef macintosh
 #include <stdio.h>
 #include "xp_mcom.h"
 #define O_ACCMODE       3       /* Mask for file access modes */
 #define EFTYPE 2000
-#ifdef __cplusplus
-extern "C" {
-#endif
+PR_BEGIN_EXTERN_C
 int mkstemp(const char *path);
-#ifdef __cplusplus
-}
-#endif
+PR_END_EXTERN_C
 #endif	/* MACINTOSH */
 
 #if !defined(_WINDOWS) && !defined(macintosh)
 #include <sys/stat.h>
 #include <errno.h>
 #endif
 
 /* define EFTYPE since most don't */
@@ -390,32 +386,28 @@ typedef struct {
 	((char *)a)[1] = ((char *)&_tmp)[0];				\
 }
 #define	P_16_COPY(a, b) {						\
 	((char *)&(b))[0] = ((char *)&(a))[1];				\
 	((char *)&(b))[1] = ((char *)&(a))[0];				\
 }
 #endif
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+PR_BEGIN_EXTERN_C
 
 extern DB *
 dbopen (const char *, int, int, DBTYPE, const void *);
 
 /* set or unset a global lock flag to disable the
  * opening of any DBM file
  */
 void dbSetOrClearDBLock(DBLockFlagEnum type);
 
 #ifdef __DBINTERFACE_PRIVATE
 DB	*__bt_open (const char *, int, int, const BTREEINFO *, int);
 DB	*__hash_open (const char *, int, int, const HASHINFO *, int);
 DB	*__rec_open (const char *, int, int, const RECNOINFO *, int);
 void	 __dbpanic (DB *dbp);
 #endif
 
-#ifdef __cplusplus
-}
-#endif
+PR_END_EXTERN_C
 
 #endif /* !_DB_H_ */