Consistent use of #ifdef for SQLITE_HAS_CODEC to avoid confusion.

FossilOrigin-Name: 34a3413a5318050254b246ad859c91c134516a32

diff --git a/manifest b/manifest
index cb78cc3fd563d30a064bf62485b50a44b3f2e4f1..98c2c6cdc7a10ee613b6b4e8965466798ca3434e 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\susing\sthe\sinternal\sprintf\sroutine\sfor\sround(x,y)\sin\sthe\scommon\scase\swhere\sy==0.
-D 2010-02-17T04:19:27
+C Consistent\suse\sof\s#ifdef\sfor\sSQLITE_HAS_CODEC\sto\savoid\sconfusion.
+D 2010-02-17T17:48:47
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c5827ead754ab32b9585487177c93bb00b9497b3
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -104,7 +104,7 @@ F sqlite3.1 6be1ad09113570e1fc8dcaff84c9b0b337db5ffc
 F sqlite3.pc.in ae6f59a76e862f5c561eb32a380228a02afc3cad
 F src/alter.c e6f4d11b1c0b23642fc46bac9abe0753c4294e05
 F src/analyze.c 55155f05ee9ab4ce33b7a4d19c449053f8935200
-F src/attach.c a6b5e97c84c46c731aad064c413e40e12cb718b7
+F src/attach.c f6d33268019460724e4c57aeec543eaaa55d8310
 F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c 744e98359dfc79fed43e8dec911e33e108b06aae
 F src/bitvec.c 06ad2c36a9c3819c0b9cbffec7b15f58d5d834e0
@@ -157,7 +157,7 @@ F src/parse.y ace5c7a125d9f2a410e431ee3209034105045f7e
 F src/pcache.c 815bcb3cf0e14b23212efd3f4981f667a5fd633e
 F src/pcache.h c683390d50f856d4cd8e24342ae62027d1bb6050
 F src/pcache1.c 2bb2261190b42a348038f5b1c285c8cef415fcc8
-F src/pragma.c 55cfa9daa145075cdb928dfce53e55665d6ad709
+F src/pragma.c 5febf8b5d88cc331effb3f2e14d0473488649b1e
 F src/prepare.c d4cd38ccfb51f1424d0e61d4878a810b7e1ebb60
 F src/printf.c 2c2702dc4955394dae554b7c45f45656eb42de7f
 F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
@@ -788,7 +788,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P 3863638b8cd8d41cf4abf8b0d618892de845e91f
-R 4a859d44fd44fb2e90c77b0569157d3b
+P d76ad8b3c494ffb4e670da0e92a1f8dbf7f48daf
+R a0fcf012eeeaa6a43756a232ecac05ef
 U shaneh
-Z 9dee3f892d9b2c7e04d5a57e6362923c
+Z 6db38cc05906d785948a9a447f1df2f3

diff --git a/manifest.uuid b/manifest.uuid
index 3eae5f6ee4ce450ae2a786f90e92bb46d27c90f8..5568ba96f1c5b2a8654e30eaee9e9ebe3ad58e83 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d76ad8b3c494ffb4e670da0e92a1f8dbf7f48daf
\ No newline at end of file
+34a3413a5318050254b246ad859c91c134516a32
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index 984d62fce714c900ff7b55328ba23336dc1d5336..f4b9428c0ff50e953563cc6efb8f53389635f3f0 100644 (file)
--- a/src/attach.c
+++ b/src/attach.c
@@ -150,7 +150,7 @@ static void attachFunc(
   aNew->zName = sqlite3DbStrDup(db, zName);
   aNew->safety_level = 3;
 
-#if SQLITE_HAS_CODEC
+#ifdef SQLITE_HAS_CODEC
   if( rc==SQLITE_OK ){
     extern int sqlite3CodecAttach(sqlite3*, int, const void*, int);
     extern void sqlite3CodecGetKey(sqlite3*, int, void**, int*);

diff --git a/src/pragma.c b/src/pragma.c
index bcc85cbb7742b4ef416a9b32b720865ae19c5bde..de5a15e27de29ccf4fae7252473c67087d392df3 100644 (file)
--- a/src/pragma.c
+++ b/src/pragma.c
@@ -1393,7 +1393,7 @@ void sqlite3Pragma(
   }else
 #endif
 
-#if SQLITE_HAS_CODEC
+#ifdef SQLITE_HAS_CODEC
   if( sqlite3StrICmp(zLeft, "key")==0 && zRight ){
     sqlite3_key(db, zRight, sqlite3Strlen30(zRight));
   }else
@@ -1416,9 +1416,9 @@ void sqlite3Pragma(
     }
   }else
 #endif
-#if SQLITE_HAS_CODEC || defined(SQLITE_ENABLE_CEROD)
+#if defined(SQLITE_HAS_CODEC) || defined(SQLITE_ENABLE_CEROD)
   if( sqlite3StrICmp(zLeft, "activate_extensions")==0 ){
-#if SQLITE_HAS_CODEC
+#ifdef SQLITE_HAS_CODEC
     if( sqlite3StrNICmp(zRight, "see-", 4)==0 ){
       sqlite3_activate_see(&zRight[4]);
     }