From 4e7a479597ea919eca9fa82e304bd424dfd9eccf Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 20 Sep 2014 00:29:20 +0000 Subject: [PATCH] Only enable HAVE_STRCHRNUL by default on linux, as that is the only place it appears to work by default. FossilOrigin-Name: 0fac2c045f47c7735af4eb68ced81d8b43622a1f --- manifest | 17 +++++++---------- manifest.uuid | 2 +- src/printf.c | 2 +- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 9125f11713..aa9b7846e6 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Revise\smacro\susage\sin\s'sqliteInt.h'. -D 2014-09-20T00:02:23.616 +C Only\senable\sHAVE_STRCHRNUL\sby\sdefault\son\slinux,\sas\sthat\sis\sthe\sonly\splace\nit\sappears\sto\swork\sby\sdefault. +D 2014-09-20T00:29:20.392 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -222,7 +222,7 @@ F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa F src/pragma.c 3f3e959390a10c0131676f0e307acce372777e0f F src/prepare.c 6ef0cf2f9274982988ed6b7cab1be23147e94196 -F src/printf.c 901a2b924f10db42b7c32936eda80feb3a769aca +F src/printf.c 3a47f526b173813d9a7f4e7044007771ba68cde1 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece F src/resolve.c a3466128b52a86c466e47ac1a19e2174f7b5cf89 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e @@ -1198,10 +1198,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 544664cadfb4e504bc0b321c865d1ecb8a831e20 -R 5186d6949cf27e738e34796d88aa31e5 -T *branch * sqliteIntMacros -T *sym-sqliteIntMacros * -T -sym-trunk * -U mistachkin -Z 51ca01ef3bf4ffdaf2fde2b29bc4c756 +P 35db3e2f350ca2bc6bb9e1a647aec7f93bfb7065 +R 8acbfeff4e0806bab5948d89d293bcf4 +U drh +Z 6fc488f20a05aa47a5cf4ff95476cc98 diff --git a/manifest.uuid b/manifest.uuid index 4d3ec94e76..da30674aba 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -35db3e2f350ca2bc6bb9e1a647aec7f93bfb7065 \ No newline at end of file +0fac2c045f47c7735af4eb68ced81d8b43622a1f \ No newline at end of file diff --git a/src/printf.c b/src/printf.c index 9173cf7332..6d4b1b4ac7 100644 --- a/src/printf.c +++ b/src/printf.c @@ -21,7 +21,7 @@ ** the glibc version so the glibc version is definitely preferred. */ #if !defined(HAVE_STRCHRNUL) -# if defined(_GNU_SOURCE) +# if defined(linux) # define HAVE_STRCHRNUL 1 # else # define HAVE_STRCHRNUL 0 -- 2.39.5