diff options
| author | wtc%google.com <devnull@localhost> | 2010-07-30 02:25:56 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2010-07-30 02:25:56 +0000 |
| commit | 38988403ee04331b057c2752f6b922d279a0ecfc (patch) | |
| tree | 2c8e03e8e973cb5c4743ab84ee7f589889f9b105 /security/nss/lib/softoken | |
| parent | bb8404cfa10be96bfaeae2d65da2a42260343ff7 (diff) | |
| download | nss-hg-38988403ee04331b057c2752f6b922d279a0ecfc.tar.gz | |
Bug 580679: 1. Remove unnecessary -I flags from the NSS makefiles.
2. Add SQLITE_INCLUDE_DIR for specifying the location of sqlite3.h.
Use this only in the directory that needs sqlite3.h, lib/softoken.
3. sdb.h does not need to include sqlite3.h. r=christophe.
Modified Files:
coreconf/headers.mk nss/lib/softoken/manifest.mn
nss/lib/softoken/sdb.h nss/lib/softoken/legacydb/manifest.mn
nss/lib/ssl/ssl3gthr.c
Diffstat (limited to 'security/nss/lib/softoken')
| -rw-r--r-- | security/nss/lib/softoken/legacydb/manifest.mn | 4 | ||||
| -rw-r--r-- | security/nss/lib/softoken/manifest.mn | 4 | ||||
| -rw-r--r-- | security/nss/lib/softoken/sdb.h | 1 |
3 files changed, 2 insertions, 7 deletions
diff --git a/security/nss/lib/softoken/legacydb/manifest.mn b/security/nss/lib/softoken/legacydb/manifest.mn index c49784604..b751c3719 100644 --- a/security/nss/lib/softoken/legacydb/manifest.mn +++ b/security/nss/lib/softoken/legacydb/manifest.mn @@ -46,10 +46,6 @@ MAPFILE = $(OBJDIR)/nssdbm.def DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -ifdef MOZILLA_CLIENT -INCLUDES += -I$(DIST)/include/sqlite3 -endif - CSRCS = \ dbmshim.c \ keydb.c \ diff --git a/security/nss/lib/softoken/manifest.mn b/security/nss/lib/softoken/manifest.mn index 1a47046f2..307683c38 100644 --- a/security/nss/lib/softoken/manifest.mn +++ b/security/nss/lib/softoken/manifest.mn @@ -47,8 +47,8 @@ MAPFILE = $(OBJDIR)/softokn.def DEFINES += -DSHLIB_SUFFIX=\"$(DLL_SUFFIX)\" -DSHLIB_PREFIX=\"$(DLL_PREFIX)\" -DSOFTOKEN_LIB_NAME=\"$(notdir $(SHARED_LIBRARY))\" -DSHLIB_VERSION=\"$(LIBRARY_VERSION)\" -ifdef MOZILLA_CLIENT -INCLUDES += -I$(DIST)/include/sqlite3 +ifdef SQLITE_INCLUDE_DIR +INCLUDES += -I$(SQLITE_INCLUDE_DIR) endif EXPORTS = \ diff --git a/security/nss/lib/softoken/sdb.h b/security/nss/lib/softoken/sdb.h index e4ded7271..517777ea0 100644 --- a/security/nss/lib/softoken/sdb.h +++ b/security/nss/lib/softoken/sdb.h @@ -60,7 +60,6 @@ #include "pkcs11t.h" #include "secitem.h" #include "sftkdbt.h" -#include <sqlite3.h> #define STATIC_CMD_SIZE 2048 |