Cleanup some #ifdefs to make their meaning clearly. No logical changes. (CVS 5001)

FossilOrigin-Name: b8bc5f3a83408375cfbff90e2c574fb8996dfbd9

diff --git a/manifest b/manifest
index 4e0c54550e0f36df0f4949c53a456b478b95dcc3..3f420321c7253108780f2cae560e425c4b9abee1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Disable\sauto_vacuum\sduring\sthe\svacuum3\stest.\s(CVS\s5000)
-D 2008-04-14T13:42:40
+C Cleanup\ssome\s#ifdefs\sto\smake\stheir\smeaning\sclearly.\s\sNo\slogical\schanges.\s(CVS\s5001)
+D 2008-04-14T14:34:44
 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -173,7 +173,7 @@ F src/tokenize.c a96abe15a8db6fea2e964cdce2acba9ed17bc26f
 F src/trigger.c 9bd3b6fa0beff4a02d262c96466f752ec15a7fc3
 F src/update.c d6f214aad7eab5aaec5f966058b0828b3f7d6706
 F src/utf.c 8c94fa10efc78c2568d08d436acc59df4df7191b
-F src/util.c 719bcd7f088badb19dfa10f2542f1ef54e673da5
+F src/util.c 8b17ea7ad27914c6e2c4a377ca7db743fb7e29a8
 F src/vacuum.c 3524411bfb58aac0d87eadd3e5b7cd532772af30
 F src/vdbe.c 444ab9ecc91f3c04b2b29ae604458426aa674fa6
 F src/vdbe.h bfd84bda447f39cb599302c7ec85067dae20453c
@@ -628,7 +628,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
-P 40ba51fd4c621e29e7ff85495b1212c92f06ab31
-R 53a12131bcb799795d694e2c2832a836
+P e2e1ca818c5f77abdb423aebe34eea80b2fb84b2
+R 070d93fdfd2475b1822d91bc6a8443c8
 U drh
-Z 417c26b7c6044c4e03fc8e60af432453
+Z d6b5d3094aaf1f820631db011bdb1544

diff --git a/manifest.uuid b/manifest.uuid
index 13f698aca98ecb0546e7f1a90187e7eef3481345..734694d33737b66334c321395fbfb1f5e1128c06 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e2e1ca818c5f77abdb423aebe34eea80b2fb84b2
\ No newline at end of file
+b8bc5f3a83408375cfbff90e2c574fb8996dfbd9
\ No newline at end of file

diff --git a/src/util.c b/src/util.c
index 98d8a908b8343c1bb8382324248b2f184da2aec2..22da5161084a7df4f4bb1afcabad56603f24568b 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -14,7 +14,7 @@
 ** This file contains functions for allocating memory, comparing
 ** strings, and stuff like that.
 **
-** $Id: util.c,v 1.220 2008/04/11 19:37:56 drh Exp $
+** $Id: util.c,v 1.221 2008/04/14 14:34:44 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdarg.h>
@@ -620,9 +620,10 @@ void sqlite3Put4byte(unsigned char *p, u32 v){
 */
 static int hexToInt(int h){
   assert( (h>='0' && h<='9') ||  (h>='a' && h<='f') ||  (h>='A' && h<='F') );
-#if !defined(SQLITE_EBCDIC)
+#ifdef SQLITE_ASCII
   h += 9*(1&(h>>6));
-#else
+#endif
+#ifdef SQLITE_EBCDIC
   h += 9*(1&~(h>>4));
 #endif
   return h & 0xf;