MoonchildProductions#1251 - Part 16: Resolve namespace conflicts with dbm on Solaris.

https://bugzilla.mozilla.org/show_bug.cgi?id=1513913

Mozilla's solution to this is arguably overkill, since the namespace issue on Solaris only required them to change (or temporarily undefine) __log2. Instead they changed ALL the functions to be something along the lines of dbm_log2. They haven't changed the external interface at all, though.

If you're unhappy with this patch, I think I could also use XP_SOLARIS ifdefs to undefine __log2 prior to where it's declared in the dbm headers. The good thing about Mozilla's solution is that it guarantees this namespace issue never occurs again on any platform, though.

1 files changed, 12 insertions, 12 deletions

diff --git a/security/nss/lib/dbm/include/mcom_db.h b/security/nss/lib/dbm/include/mcom_db.h
index 0a4f6dc14..e961dd1b4 100644
--- a/security/nss/lib/dbm/include/mcom_db.h
+++ b/security/nss/lib/dbm/include/mcom_db.h
@@ -287,16 +287,16 @@ typedef enum { LockOutDatabase,
 #endif
 
 /* Access method description structure. */
-typedef struct __db {
+typedef struct dbm_db {
     DBTYPE type; /* Underlying db type. */
-    int (*close)(struct __db *);
-    int (*del)(const struct __db *, const DBT *, uint);
-    int (*get)(const struct __db *, const DBT *, DBT *, uint);
-    int (*put)(const struct __db *, DBT *, const DBT *, uint);
-    int (*seq)(const struct __db *, DBT *, DBT *, uint);
-    int (*sync)(const struct __db *, uint);
+    int (*close)(struct dbm_db *);
+    int (*del)(const struct dbm_db *, const DBT *, uint);
+    int (*get)(const struct dbm_db *, const DBT *, DBT *, uint);
+    int (*put)(const struct dbm_db *, DBT *, const DBT *, uint);
+    int (*seq)(const struct dbm_db *, DBT *, DBT *, uint);
+    int (*sync)(const struct dbm_db *, uint);
     void *internal; /* Access method private. */
-    int (*fd)(const struct __db *);
+    int (*fd)(const struct dbm_db *);
 } DB;
 
 #define BTREEMAGIC 0x053162
@@ -412,10 +412,10 @@ dbopen(const char *, int, int, DBTYPE, const void *);
 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);
+DB *dbm_bt_open(const char *, int, int, const BTREEINFO *, int);
+DB *dbm_hash_open(const char *, int, int, const HASHINFO *, int);
+DB *dbm_rec_open(const char *, int, int, const RECNOINFO *, int);
+void dbm_dbpanic(DB *dbp);
 #endif
 
 PR_END_EXTERN_C