[PATCH 2 of 2] Build DBM module

Wald Commits scm-commit at wald.intevation.org
Tue Aug 5 18:58:10 CEST 2014


# HG changeset patch
# User Andre Heinecke <andre.heinecke at intevation.de>
# Date 1407257883 -7200
# Node ID b513267f632f8475865f7a45ea390d875e135f5d
# Parent  150b7211354542850cca0fdecaee4d7b1161a41f
Build DBM module

diff -r 150b72113545 -r b513267f632f CMakeLists.txt
--- a/CMakeLists.txt	Tue Aug 05 18:32:02 2014 +0200
+++ b/CMakeLists.txt	Tue Aug 05 18:58:03 2014 +0200
@@ -45,9 +45,9 @@
 set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DNSS_DISABLE_ROOT_CERTS -DNSS_DISABLE_LIBPKIX -DSHLIB_SUFFIX=\\\"dll\\\"")
 set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DSHLIB_PREFIX=\\\"\\\" -DSOFTOKEN_LIB_NAME=\\\"softokn3.dll\\\"")
 set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DNSS_X86_OR_X64 -DNSS_X86 -D_X86_")
-set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DMP_NO_MP_WORD -DMP_USE_UINT_DIGIT")
+set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DMP_NO_MP_WORD -DMP_USE_UINT_DIGIT -D__DBINTERFACE_PRIVATE")
 #set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DMP_ASSEMBLY_MULTIPLY -DMP_ASSEMBLY_SQUARE -DMP_ASSEMBLY_DIV_2DX1D ")
-set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DNO_NSPR_10_SUPPORT -DXP_WIN32 -DXP_WIN")
+set (NSS_DEFINITIONS "${NSS_DEFINITIONS} -DNO_NSPR_10_SUPPORT -DXP_WIN32 -DXP_WIN -D_WINDOWS")
 
 set (NSPR_DEFINITIONS "${COMMON_DEFINITIONS} -D_NSPR_BUILD")
 
@@ -247,6 +247,11 @@
    nss/lib/dbm/src/memmove.c
    nss/lib/dbm/src/mktemp.c
    nss/lib/dbm/src/hash.c
+   nss/lib/dbm/src/hash_buf.c
+   nss/lib/dbm/src/h_bigkey.c
+   nss/lib/dbm/src/h_page.c
+   nss/lib/dbm/src/h_log2.c
+   nss/lib/dbm/src/h_func.c
    sqlite/sqlite3.c
    )
 
diff -r 150b72113545 -r b513267f632f nss/lib/dbm/include/hash.h
--- a/nss/lib/dbm/include/hash.h	Tue Aug 05 18:32:02 2014 +0200
+++ b/nss/lib/dbm/include/hash.h	Tue Aug 05 18:58:03 2014 +0200
@@ -37,6 +37,7 @@
 /* Operations */
 
 #include <stdio.h>
+#include "cdefs.h"
 #include "mcom_db.h"
 typedef enum {
 	HASH_GET, HASH_PUT, HASH_PUTNEW, HASH_DELETE, HASH_FIRST, HASH_NEXT
diff -r 150b72113545 -r b513267f632f nss/lib/dbm/src/.hash.c.swp
Binary file nss/lib/dbm/src/.hash.c.swp has changed


More information about the Trustbridge-commits mailing list