diff options
| author | Martin Thomson <martin.thomson@gmail.com> | 2015-08-07 17:34:12 -0700 |
|---|---|---|
| committer | Martin Thomson <martin.thomson@gmail.com> | 2015-08-07 17:34:12 -0700 |
| commit | df18e4c7e5e9ad31fab45575896fba7d2bc24250 (patch) | |
| tree | f07ff7f0e8d1d06e564917eb58af355c1fa7d456 /lib/sqlite | |
| parent | c084b875adee244f5f56dd03e8948239d1f6c076 (diff) | |
| download | nss-hg-df18e4c7e5e9ad31fab45575896fba7d2bc24250.tar.gz | |
Bug 1182667 - Removing warnings, enabling -Werror, r=rrelyea
Diffstat (limited to 'lib/sqlite')
| -rw-r--r-- | lib/sqlite/Makefile | 5 | ||||
| -rw-r--r-- | lib/sqlite/sqlite3.c | 10 |
2 files changed, 10 insertions, 5 deletions
diff --git a/lib/sqlite/Makefile b/lib/sqlite/Makefile index a2f0cf7d5..dd8ea1434 100644 --- a/lib/sqlite/Makefile +++ b/lib/sqlite/Makefile @@ -46,3 +46,8 @@ include $(CORE_DEPTH)/coreconf/rules.mk export:: private_export +ifeq (WINNT,$(OS_ARCH)) +# sqlite calls the deprecated GetVersionExA method +OS_CFLAGS += -w44996 +endif + diff --git a/lib/sqlite/sqlite3.c b/lib/sqlite/sqlite3.c index 8ec2bb950..8f261e801 100644 --- a/lib/sqlite/sqlite3.c +++ b/lib/sqlite/sqlite3.c @@ -8149,17 +8149,17 @@ typedef INT8_TYPE i8; /* 1-byte signed integer */ ** Macros to determine whether the machine is big or little endian, ** evaluated at runtime. */ -#ifdef SQLITE_AMALGAMATION -SQLITE_PRIVATE const int sqlite3one = 1; -#else -SQLITE_PRIVATE const int sqlite3one; -#endif #if defined(i386) || defined(__i386__) || defined(_M_IX86)\ || defined(__x86_64) || defined(__x86_64__) # define SQLITE_BIGENDIAN 0 # define SQLITE_LITTLEENDIAN 1 # define SQLITE_UTF16NATIVE SQLITE_UTF16LE #else +# ifdef SQLITE_AMALGAMATION +SQLITE_PRIVATE const int sqlite3one = 1; +# else +SQLITE_PRIVATE const int sqlite3one; +# endif # define SQLITE_BIGENDIAN (*(char *)(&sqlite3one)==0) # define SQLITE_LITTLEENDIAN (*(char *)(&sqlite3one)==1) # define SQLITE_UTF16NATIVE (SQLITE_BIGENDIAN?SQLITE_UTF16BE:SQLITE_UTF16LE) |