diff options
| author | Edouard Oger <eoger@fastmail.com> | 2019-05-08 15:33:42 +0000 |
|---|---|---|
| committer | Edouard Oger <eoger@fastmail.com> | 2019-05-08 15:33:42 +0000 |
| commit | 2e5e81cb989532812517822dc4f2ca7a28cb3666 (patch) | |
| tree | 6524f96d961bb4d2ef5256174acbc857d185ecc9 /lib/sqlite | |
| parent | a10b5b82f643457cd84b373e047a0cc6259e8bf7 (diff) | |
| download | nss-hg-2e5e81cb989532812517822dc4f2ca7a28cb3666.tar.gz | |
Bug 1549847 - Do not treat warnings as errors on iOS. r=KevinJacobs,jcj
Differential Revision: https://phabricator.services.mozilla.com/D30270
Diffstat (limited to 'lib/sqlite')
| -rw-r--r-- | lib/sqlite/sqlite3.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/lib/sqlite/sqlite3.c b/lib/sqlite/sqlite3.c index c0ab2337e..3fed1b728 100644 --- a/lib/sqlite/sqlite3.c +++ b/lib/sqlite/sqlite3.c @@ -18397,8 +18397,15 @@ static int sqlite3MemInit(void *NotUsed){ malloc_zone_t* newzone = malloc_create_zone(4096, 0); malloc_set_zone_name(newzone, "Sqlite_Heap"); do{ + #ifdef DARWIN // On iOS gyp build fails because of -Werror. + #pragma clang diagnostic push + #pragma clang diagnostic warning "-Wdeprecated-declarations" + #endif success = OSAtomicCompareAndSwapPtrBarrier(NULL, newzone, (void * volatile *)&_sqliteZone_); + #ifdef DARWIN + #pragma clang diagnostic pop + #endif }while(!_sqliteZone_); if( !success ){ /* somebody registered a zone first */ @@ -26957,7 +26964,14 @@ SQLITE_PRIVATE const char *sqlite3OpcodeName(int i){ && (!defined(TARGET_IPHONE_SIMULATOR) || (TARGET_IPHONE_SIMULATOR==0)) # define HAVE_GETHOSTUUID 1 # else +# ifdef DARWIN // On iOS gyp build fails because of -Werror. +# pragma clang diagnostic push +# pragma clang diagnostic warning "-W#warnings" +# endif # warning "gethostuuid() is disabled." +# ifdef DARWIN +# pragma clang diagnostic pop +# endif # endif #endif |