From: drh Date: Tue, 30 Mar 2010 11:57:01 +0000 (+0000) Subject: Change an #if into an #ifdef. X-Git-Tag: version-3.7.2~513 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d454214ddde539caca5952d7ad6ca01176160acb;p=thirdparty%2Fsqlite.git Change an #if into an #ifdef. FossilOrigin-Name: 371bab5d6534860ce908e52129c64a49946be33a --- diff --git a/manifest b/manifest index 4c348eb3a5..512b6fb64f 100644 --- a/manifest +++ b/manifest @@ -1,8 +1,8 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -C Pull\sthe\sexperimental\sfile-size-in-header\schanges\sinto\sthe\strunk. -D 2010-03-29T21:22:01 +C Change\san\s#if\sinto\san\s#ifdef. +D 2010-03-30T11:57:01 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 4f2f967b7e58a35bb74fb7ec8ae90e0f4ca7868b F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -169,7 +169,7 @@ F src/resolve.c a1648d98e869937b29f4f697461fe4d60f220a7b F src/rowset.c 69afa95a97c524ba6faf3805e717b5b7ae85a697 F src/select.c 4113ef360430ed4e7533690ef46d06c20204adce F src/shell.c c40427c7245535a04a9cb4a417b6cc05c022e6a4 -F src/sqlite.h.in 6f36690f4749cbfdd778054a4c79bf4016b794a3 +F src/sqlite.h.in 68136db68b5e97ee93964229cf5075e703c0fbc2 F src/sqlite3ext.h 69dfb8116af51b84a029cddb3b35062354270c89 F src/sqliteInt.h f9b890585c644da05e86b772042ae2059e61fd27 F src/sqliteLimit.h 3afab2291762b5d09ae20c18feb8e9fa935a60a6 @@ -797,14 +797,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f -P 9e075e70f0e2a1ad302d17150cd58f91669a97a6 01ef6c1944507c188a83a434ff00e98ad767f744 -R 374d4e1ebc45357833ef412064f83b3a +P 0092b36c7bbd04bf3826de7805e8a14739390f31 +R e6830afd696f92886f4e15da36e8a21e U drh -Z 57cc17a4ebdb6db8a7496650df2ea784 +Z 40be774e9b474c9229e7a0a284180d51 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) -iD8DBQFLsRn8oxKgR168RlERAg2zAKCErrX+/Kxo1OQ3scmJtMXF6sW7igCfRiyC -IbDKiWnRdJiQJBnIvthiNrk= -=Js1q +iD8DBQFLsecQoxKgR168RlERArHaAJ9qx0xDw9sULVJZASqsXe/+aloLGQCeOPwi +veew0hRT3qVYZBfj+VUdiAo= +=Cote -----END PGP SIGNATURE----- diff --git a/manifest.uuid b/manifest.uuid index 012e1c5a75..a4bbe9c9ef 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -0092b36c7bbd04bf3826de7805e8a14739390f31 \ No newline at end of file +371bab5d6534860ce908e52129c64a49946be33a \ No newline at end of file diff --git a/src/sqlite.h.in b/src/sqlite.h.in index 920f3ca4f8..eef6b7ab52 100644 --- a/src/sqlite.h.in +++ b/src/sqlite.h.in @@ -3679,7 +3679,7 @@ int sqlite3_collation_needed16( void(*)(void*,sqlite3*,int eTextRep,const void*) ); -#if SQLITE_HAS_CODEC +#ifdef SQLITE_HAS_CODEC /* ** Specify the key for an encrypted database. This routine should be ** called right after sqlite3_open().