From: drh <drh@noemail.net>
Date: Fri, 8 Nov 2013 17:03:50 +0000 (+0000)
Subject: Merge the Cygwin directory separator fix.  Also fix a C++-ism in the
X-Git-Tag: version-3.8.2~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=95a5bcbb007417fedabc0c3508b6b640983804f5;p=thirdparty%2Fsqlite.git

Merge the Cygwin directory separator fix.  Also fix a C++-ism in the
multiplexor code so that it will compile on MSVC.

FossilOrigin-Name: 830629d31d171155d90ff87ae8e70094d17bb2d3
---

95a5bcbb007417fedabc0c3508b6b640983804f5
diff --cc manifest
index 6bbae7bba9,4f7397798c..d5a4108bc9
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Performance\simprovement:\sAvoid\sunnecessary\sseeks\son\sREPLACE\sINTO\sfor\sa\nWITHOUT\sROWID\stable.
- D 2013-11-08T16:54:56.609
 -C Fix\stemporary\sdirectory\sseparator\shandling\sfor\sCygwin.
 -D 2013-11-07T22:11:55.758
++C Merge\sthe\sCygwin\sdirectory\sseparator\sfix.\s\sAlso\sfix\sa\sC++-ism\sin\sthe\nmultiplexor\scode\sso\sthat\sit\swill\scompile\son\sMSVC.
++D 2013-11-08T17:03:50.071
  F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
  F Makefile.in d12e4455cf7a36e42d3949876c1c3b88ff70867a
  F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@@ -253,7 -253,7 +253,7 @@@ F src/test_intarray.h 2ece66438cfd177b7
  F src/test_journal.c f5c0a05b7b3d5930db769b5ee6c3766dc2221a64
  F src/test_loadext.c df586c27176e3c2cb2e099c78da67bf14379a56e
  F src/test_malloc.c eba4e1c5847cc98e7edc98f62265cd2abafba7a6
- F src/test_multiplex.c 6f63947cca286eeed0adc5f8d63fb17347648d4b
 -F src/test_multiplex.c 5d691eeb6cb6aa7888da28eba5e62a9a857d3c0f
++F src/test_multiplex.c 9f304bf04170c91c0318238d512df2da039eb1c8
  F src/test_multiplex.h 110a8c4d356e0aa464ca8730375608a9a0b61ae1
  F src/test_mutex.c 293042d623ebba969160f471a82aa1551626454f
  F src/test_onefile.c 0396f220561f3b4eedc450cef26d40c593c69a25
@@@ -1135,7 -1135,10 +1135,8 @@@ F tool/vdbe-compress.tcl f12c884766bd14
  F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
  F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
  F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
- P 6f187a0fb1b09ebc4732c4afbf3c813f82e069f1
- R eedb71726af8e12f0f13d18d7fd22009
 -P 404bd98fb41f71d041932d68a908570995825ec1
 -R 37545b181f36caed5c7fe5390bfd2bd9
 -T *branch * cygDirSep
 -T *sym-cygDirSep *
 -T -sym-trunk *
 -U mistachkin
 -Z ed8b65be89adc0112f5f37e7909c811f
++P fd11afa5f5c853dcac2290444b581a3fe1d4332d 9d870d5f0d8f02e5c91396a1f98b5ddb56b40b70
++R deb20dcd1b212d002ce341c4a8b6d225
++T +closed 9d870d5f0d8f02e5c91396a1f98b5ddb56b40b70
 +U drh
- Z 047e6bb9b5b607bfaacf5c7e4c685d04
++Z 91483894a7585609e534fd671adf83ff
diff --cc manifest.uuid
index 7a0daf8187,5ecadff839..376075f774
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- fd11afa5f5c853dcac2290444b581a3fe1d4332d
 -9d870d5f0d8f02e5c91396a1f98b5ddb56b40b70
++830629d31d171155d90ff87ae8e70094d17bb2d3
diff --cc src/test_multiplex.c
index 469823094c,624541b32a..45a1edfbbe
--- a/src/test_multiplex.c
+++ b/src/test_multiplex.c
@@@ -768,9 -766,7 +768,10 @@@ static int multiplexRead
    }else{
      while( iAmt > 0 ){
        int i = (int)(iOfst / pGroup->szChunk);
 -      sqlite3_file *pSubOpen = multiplexSubOpen(pGroup, i, &rc, NULL, 1);
++      sqlite3_file *pSubOpen;
 +      if( nMutex==0 ){ multiplexEnter(); nMutex++; }
-       sqlite3_file *pSubOpen = multiplexSubOpen(pGroup, i, &rc, NULL, 1);
++      pSubOpen = multiplexSubOpen(pGroup, i, &rc, NULL, 1);
 +      multiplexLeave(); nMutex--;
        if( pSubOpen ){
          int extra = ((int)(iOfst % pGroup->szChunk) + iAmt) - pGroup->szChunk;
          if( extra<0 ) extra = 0;