From: drh <drh@noemail.net>
Date: Tue, 29 May 2012 17:02:40 +0000 (+0000)
Subject: Changes some NDEBUG macros to SQLITE_DEBUG in os_unix.c.  The is a notational
X-Git-Tag: version-3.7.13~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d3d8c04fd1c5e03f9e075d83a44a69d380884b2a;p=thirdparty%2Fsqlite.git

Changes some NDEBUG macros to SQLITE_DEBUG in os_unix.c.  The is a notational
change only and really should not effect the code.

FossilOrigin-Name: 8e3025709e4954803919c84f3a810c7c63c60601
---

diff --git a/manifest b/manifest
index 97ff035bc2..29dc9ce942 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C In\sthe\sRTree\smodule,\smake\ssure\sall\sdouble-to-float\sconversions\sround\sin\sa\ndirection\sto\sincrease\sthe\ssize\sof\selement\sbounding\sboxes.
-D 2012-05-29T00:39:50.223
+C Changes\ssome\sNDEBUG\smacros\sto\sSQLITE_DEBUG\sin\sos_unix.c.\s\sThe\sis\sa\snotational\nchange\sonly\sand\sreally\sshould\snot\seffect\sthe\scode.
+D 2012-05-29T17:02:40.005
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 4f37eb61be9d38643cdd839a74b8e3bad724cfcf
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -164,7 +164,7 @@ F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
 F src/os.h 59beba555b65a450bd1d804220532971d4299f60
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
-F src/os_unix.c 424d46e0edab969293c2223f09923b2178171f47
+F src/os_unix.c 8a90a7cdfc19ed0f233d76b63825d8effcae302a
 F src/os_win.c 412d6434133c7c81dc48b7702f3ea5e61c309e5c
 F src/pager.c 9d4d6406512002d9a243ec27b9c01e93fda43e36
 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
@@ -1004,7 +1004,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh a8a0a3babda96dfb1ff51adda3cbbf3dfb7266c2
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 480158143be1256cbe4dba52ef1a5b96e172b38c f607ad27c1ede27af24dbee10ca867c8f7761ee3
-R 38bedd0c37f624ccf215394e11ad9336
+P 0abdc2903d8b3f86cad426e1bac2a959d1b1f7dd
+R 99e554d1747c9743d7f383f83e1b186d
 U drh
-Z 4bf39e44bbbf20a271c4dc152544fd6f
+Z 66446fe8bdcb030202f3dea3dae3cedf
diff --git a/manifest.uuid b/manifest.uuid
index 942005486b..0b0410c98f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0abdc2903d8b3f86cad426e1bac2a959d1b1f7dd
\ No newline at end of file
+8e3025709e4954803919c84f3a810c7c63c60601
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index c85e9b53af..f1d3a08a06 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -227,7 +227,7 @@ struct unixFile {
 #if OS_VXWORKS
   struct vxworksFileId *pId;          /* Unique file ID */
 #endif
-#ifndef NDEBUG
+#ifdef SQLITE_DEBUG
   /* The next group of variables are used to track whether or not the
   ** transaction counter in bytes 24-27 of database files are updated
   ** whenever any part of the database changes.  An assertion fault will
@@ -1563,7 +1563,7 @@ static int unixLock(sqlite3_file *id, int eFileLock){
   }
   
 
-#ifndef NDEBUG
+#ifdef SQLITE_DEBUG
   /* Set up the transaction-counter change checking flags when
   ** transitioning from a SHARED to a RESERVED lock.  The change
   ** from SHARED to RESERVED marks the beginning of a normal
@@ -1642,7 +1642,7 @@ static int posixUnlock(sqlite3_file *id, int eFileLock, int handleNFSUnlock){
   if( pFile->eFileLock>SHARED_LOCK ){
     assert( pInode->eFileLock==pFile->eFileLock );
 
-#ifndef NDEBUG
+#ifdef SQLITE_DEBUG
     /* When reducing a lock such that other processes can start
     ** reading the database file again, make sure that the
     ** transaction counter was updated if any part of the database
@@ -2841,7 +2841,7 @@ static int afpUnlock(sqlite3_file *id, int eFileLock) {
     SimulateIOError( h=(-1) )
     SimulateIOErrorBenign(0);
     
-#ifndef NDEBUG
+#ifdef SQLITE_DEBUG
     /* When reducing a lock such that other processes can start
     ** reading the database file again, make sure that the
     ** transaction counter was updated if any part of the database
@@ -3145,7 +3145,7 @@ static int unixWrite(
   );
 #endif
 
-#ifndef NDEBUG
+#ifdef SQLITE_DEBUG
   /* If we are doing a normal write to a database file (as opposed to
   ** doing a hot-journal rollback or a write to some file other than a
   ** normal database file) then record the fact that the database
@@ -3436,7 +3436,7 @@ static int unixTruncate(sqlite3_file *id, i64 nByte){
     pFile->lastErrno = errno;
     return unixLogError(SQLITE_IOERR_TRUNCATE, "ftruncate", pFile->zPath);
   }else{
-#ifndef NDEBUG
+#ifdef SQLITE_DEBUG
     /* If we are doing a normal write to a database file (as opposed to
     ** doing a hot-journal rollback or a write to some file other than a
     ** normal database file) and we truncate the file to zero length,
@@ -3593,7 +3593,7 @@ static int unixFileControl(sqlite3_file *id, int op, void *pArg){
       *(char**)pArg = sqlite3_mprintf("%s", pFile->pVfs->zName);
       return SQLITE_OK;
     }
-#ifndef NDEBUG
+#ifdef SQLITE_DEBUG
     /* The pager calls this method to signal that it has done
     ** a rollback and that the database is therefore unchanged and
     ** it hence it is OK for the transaction change counter to be