Index: src/util.c ================================================================== --- src/util.c +++ src/util.c @@ -12,11 +12,11 @@ ** Utility functions used throughout sqlite. ** ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** -** $Id: util.c,v 1.130 2005/02/01 10:35:07 danielk1977 Exp $ +** $Id: util.c,v 1.131 2005/03/10 12:35:46 drh Exp $ */ #include "sqliteInt.h" #include #include @@ -900,11 +900,11 @@ v >>= 7; }while( v!=0 && i<9 ); return i; } -#if (!defined(SQLITE_OMIT_BLOB_LITERAL) && !defined(SQLITE_HAS_CODEC)) \ +#if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC) \ || defined(SQLITE_TEST) /* ** Translate a single byte of Hex into an integer. */ static int hexToInt(int h){ @@ -915,11 +915,11 @@ }else{ assert( h>='A' && h<='F' ); return h - 'A' + 10; } } -#endif /* (!SQLITE_OMIT_BLOB_LITERAL && !SQLITE_HAS_CODEC) || SQLITE_TEST */ +#endif /* !SQLITE_OMIT_BLOB_LITERAL || SQLITE_HAS_CODEC || SQLITE_TEST */ #if !defined(SQLITE_OMIT_BLOB_LITERAL) || defined(SQLITE_HAS_CODEC) /* ** Convert a BLOB literal of the form "x'hhhhhh'" into its binary ** value. Return a pointer to its binary value. Space to hold the