From: drh <drh@noemail.net>
Date: Thu, 20 Jul 2017 21:01:53 +0000 (+0000)
Subject: Transform two #ifdef statements into #if statements.
X-Git-Tag: version-3.19.4~1^2~1^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=94e32acb5684d086e8168fa99368aa7af61e8307;p=thirdparty%2Fsqlite.git

Transform two #ifdef statements into #if statements.

FossilOrigin-Name: f2c6b5845028ef25dcd17e23e11b93c9f7296c26c7a21718fdae8f4b48c4e1da
---

diff --git a/manifest b/manifest
index 7bf3e67604..d3ceb012e2 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Split\sSQLITE_ENABLE_ATOMIC_WRITE\sinto\stwo\soptions\s-\sthe\soriginal\sand\nSQLITE_ENABLE_BATCH_ATOMIC_WRITE.
-D 2017-07-20T21:00:03.793
+C Transform\stwo\s#ifdef\sstatements\sinto\s#if\sstatements.
+D 2017-07-20T21:01:53.887
 F Makefile.in d9873c9925917cca9990ee24be17eb9613a668012c85a343aef7e5536ae266e8
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 02b469e9dcd5b7ee63fc1fb05babc174260ee4cfa4e0ef2e48c3c6801567a016
@@ -424,7 +424,7 @@ F src/mem1.c c12a42539b1ba105e3707d0e628ad70e611040d8f5e38cf942cee30c867083de
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
 F src/mem3.c 8768ac94694f31ffaf8b4d0ea5dc08af7010a35a
 F src/mem5.c 9bf955937b07f8c32541c8a9991f33ce3173d944
-F src/memjournal.c 8669a499261d2c51ab2eb6c10b3b2e5085e559457ea630140de7f3521077daaa
+F src/memjournal.c 9b9e579226341e891a4657dc76fe2cec69734abcd23be0e42aa8764d88131f12
 F src/msvc.h 4942752b6a253116baaa8de75256c51a459a5e81
 F src/mutex.c 8e45800ee78e0cd1f1f3fe8e398853307f4a085c
 F src/mutex.h 779d588e3b7756ec3ecf7d78cde1d84aba414f85
@@ -1637,7 +1637,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 416973ede3bde8567d1f2699728f72352979e054ef988d1c1e1cfe4290f6f8b8
-R 1638e645768cee73f97e29d4fc63d373
-U dan
-Z d68435e6ed708ea00daef410ca52596e
+P 7eb9bf2c5b42c39901fd571553c1f70aa5a9dac71fdc8e318b3063b928ad58f7
+R 07625fb6756b6e7b352836395541d6b0
+U drh
+Z cd9d564ae288b39921ae68db54ad611b
diff --git a/manifest.uuid b/manifest.uuid
index b2b1149ce4..9016b58029 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7eb9bf2c5b42c39901fd571553c1f70aa5a9dac71fdc8e318b3063b928ad58f7
\ No newline at end of file
+f2c6b5845028ef25dcd17e23e11b93c9f7296c26c7a21718fdae8f4b48c4e1da
\ No newline at end of file
diff --git a/src/memjournal.c b/src/memjournal.c
index 493eb9a3b6..31ab5ef93f 100644
--- a/src/memjournal.c
+++ b/src/memjournal.c
@@ -96,7 +96,7 @@ static int memjrnlRead(
   int iChunkOffset;
   FileChunk *pChunk;
 
-#ifdef SQLITE_ENABLE_ATOMIC_WRITE \
+#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
  || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
   if( (iAmt+iOfst)>p->endpoint.iOffset ){
     return SQLITE_IOERR_SHORT_READ;
@@ -216,7 +216,7 @@ static int memjrnlWrite(
     ** atomic-write optimization. In this case the first 28 bytes of the
     ** journal file may be written as part of committing the transaction. */ 
     assert( iOfst==p->endpoint.iOffset || iOfst==0 );
-#ifdef SQLITE_ENABLE_ATOMIC_WRITE \
+#if defined(SQLITE_ENABLE_ATOMIC_WRITE) \
  || defined(SQLITE_ENABLE_BATCH_ATOMIC_WRITE)
     if( iOfst==0 && p->pFirst ){
       assert( p->nChunkSize>iAmt );