Make sure the sqlite3DebugPrintf() function is defined for OSTRACE as well.

FossilOrigin-Name: ae5af70427e0df960a54c48cd27a6288500b1f31

diff --git a/manifest b/manifest
index f3d2bc3b41a805f1bb56b98f79cf4d4b8928ee59..3bcf3f28858e3611e3848a2b6fdbf2d2e6073f18 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\supdates\sfrom\strunk.\s\sMake\sOSTRACE\schanges\swork\son\sLinux.
-D 2015-04-16T03:24:38.672
+C Make\ssure\sthe\ssqlite3DebugPrintf()\sfunction\sis\sdefined\sfor\sOSTRACE\sas\swell.
+D 2015-04-16T03:37:19.418
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f78b1ab81b64e7c57a75d170832443e66c0880a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -212,7 +212,7 @@ F src/mutex_w32.c 61660ada28d8308ad190f444c2170c4f2a590c2f
 F src/notify.c 9711a7575036f0d3040ba61bc6e217f13a9888e7
 F src/os.c 8fd25588eeba74068d41102d26810e216999b6c8
 F src/os.h 3e57a24e2794a94d3cf2342c6d9a884888cd96bf
-F src/os_common.h 4613f59778954663f1db6b9a68f091be9310d6ae
+F src/os_common.h 7cb39fb6ceec8c69a27d001163b41880fa9b23c0
 F src/os_setup.h c9d4553b5aaa6f73391448b265b89bed0b890faa
 F src/os_unix.c cf45d7b1cd27341ba8699e62c4902062b6297039
 F src/os_win.c c2f0b0b3541906e310588b9e95080df4df75b674
@@ -226,7 +226,7 @@ F src/pcache1.c 69d137620a305f814398bd29a0c998038c0695e9
 F src/pragma.c 3965ae4e82bed39fb97ce04c5fe18c9bc3ee6a88
 F src/pragma.h 09c89bca58e9a44de2116cc8272b8d454657129f
 F src/prepare.c 1fffbdcd6f8a0173a8f70d71f22528f4c0e1e3d3
-F src/printf.c 08fa675c200aac29e561c6153f91f909ed17612f
+F src/printf.c 18df0da8c343dc4380f27a803858f2a4b81f1824
 F src/random.c ba2679f80ec82c4190062d756f22d0c358180696
 F src/resolve.c 66cfe49a9c3b449ef13b89a8c47036a4ed167eab
 F src/rowset.c eccf6af6d620aaa4579bd3b72c1b6395d9e9fa1e
@@ -235,7 +235,7 @@ F src/shell.c 72b61a9d41ba12b67ea06fe9267abcc012c6c5bb
 F src/sqlite.h.in ca27603a36fcacdaac5a19d8ee35aaff8ce8516f
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 17d487c3c91b0b8c584a32fbeb393f6f795eea7d
-F src/sqliteInt.h 2c4f9e8a3ebebdcecc4a214638eb190eb56932a4
+F src/sqliteInt.h 2aa91b5b500aaf877c59e00a6e1c81c0b4d4babe
 F src/sqliteLimit.h 216557999cb45f2e3578ed53ebefe228d779cb46
 F src/status.c f266ad8a2892d659b74f0f50cb6a88b6e7c12179
 F src/table.c e7a09215315a978057fb42c640f890160dbcc45e
@@ -1250,7 +1250,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 f664bfdc82597a4530d4f4938bb96557b43b171b d3c00d61581c8ba6dce5618391432d3af8d324d4
-R fc38550e22f348cd0d3d2f2ddf7d63af
+P cd1542664eb3eb46d486664ded49cd9c4bef3948
+R bcc89826e9f25bef6a366a7f195dedc4
 U mistachkin
-Z ee67c55d1a8d246e247c4904241d9e6b
+Z fe350e14fe404098bece6b10d955edca

diff --git a/manifest.uuid b/manifest.uuid
index 979b90634e6fcb51151d3f7c5c43be99121a0002..8c79a12f65d9997a43f0721a935887d5f2db0a40 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-cd1542664eb3eb46d486664ded49cd9c4bef3948
\ No newline at end of file
+ae5af70427e0df960a54c48cd27a6288500b1f31
\ No newline at end of file

diff --git a/src/os_common.h b/src/os_common.h
index 837f947143fb4d7d324feac8e7363c412f348f61..24b00f66833a2e4caea7308f92127924440e014c 100644 (file)
--- a/src/os_common.h
+++ b/src/os_common.h
@@ -38,8 +38,8 @@
 # define OSTRACE(X)          if( sqlite3OSTrace ) sqlite3DebugPrintf X
 # define SQLITE_HAVE_OS_TRACE
 #else
-# undef  SQLITE_HAVE_OS_TRACE
 # define OSTRACE(X)
+# undef  SQLITE_HAVE_OS_TRACE
 #endif
 
 /*

diff --git a/src/printf.c b/src/printf.c
index 1a978dc5ca7955d89845bba168f42a5e7b24d406..d4063174ac18f6c1f9041ae2e9d72fc35862c58f 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -1059,7 +1059,7 @@ void sqlite3_log(int iErrCode, const char *zFormat, ...){
   }
 }
 
-#if defined(SQLITE_DEBUG)
+#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE)
 /*
 ** A version of printf() that understands %lld.  Used for debugging.
 ** The printf() built into some versions of windows does not understand %lld

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index e22da91e5b6e4d5f45c2973b8c54aebed3025d8a..769b2afe8c152ed5fedb5574caacd4c528603007 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -3146,7 +3146,7 @@ void sqlite3XPrintf(StrAccum*, u32, const char*, ...);
 char *sqlite3MPrintf(sqlite3*,const char*, ...);
 char *sqlite3VMPrintf(sqlite3*,const char*, va_list);
 char *sqlite3MAppendf(sqlite3*,char*,const char*,...);
-#if defined(SQLITE_TEST) || defined(SQLITE_DEBUG)
+#if defined(SQLITE_DEBUG) || defined(SQLITE_HAVE_OS_TRACE)
   void sqlite3DebugPrintf(const char*, ...);
 #endif
 #if defined(SQLITE_TEST)