Remove dead code from os_win.c. Ticket #3232. (CVS 5441)

FossilOrigin-Name: 5c5c1f72797e4ceb229b8e3a7c65e5f173bb9e1a

diff --git a/manifest b/manifest
index c87d9186e0b295b7c7e23348eb936e3b744fecbf..081287fa6c0842fcc688647caeb9bac1b480917d 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Use\sthe\sactual\ssize\sof\smemory\sallocations\sto\supdate\sthe\smemory\sstatus\ncounters.\s\sFix\sthe\sroundup()\sfunction\sof\smem3\sto\sbe\smuch\scloser\sto\sthe\nactual\sallocation\ssize.\s\sTicket\s#3226.\s(CVS\s5440)
-D 2008-07-18T18:56:17
+C Remove\sdead\scode\sfrom\sos_win.c.\s\sTicket\s\s#3232.\s(CVS\s5441)
+D 2008-07-18T23:47:43
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in a03f7cb4f7ad50bc53a788c6c544430e81f95de4
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -133,7 +133,7 @@ F src/os.h ef8abeb9afc694b82dbd169a91c9b7e26db3c892
 F src/os_common.h 24525d8b7bce66c374dfc1810a6c9043f3359b60
 F src/os_os2.c da14449fc210cd313eb56cf511ae05b350e323d6
 F src/os_unix.c 1df6108efdb7957a9f28b9700600e58647c9c12d
-F src/os_win.c 2bf2f8cd700299564cc236262c2668e1e02c626a
+F src/os_win.c 08f8678d2cce51f2366ef3579fdfad9aad745b06
 F src/pager.c e65d78bdbd316c3ca0135d2a98ecc607873145aa
 F src/pager.h 588c1ac195228b2da45c4e5f7ab6c2fd253d1751
 F src/parse.y d1316f1b8b251412bdf4926c4c34803977958b65
@@ -608,7 +608,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 3b2dd417f9dab3cae3ab3693629a65a2c90f00e9
-R b952824ae01948aa242495ef9fa716b0
+P 5c22132eb171058f30ec5b7562b8164611236748
+R e6e5c52038725d75fcfc314f6d0945ad
 U drh
-Z a0ec33b666d5637887a3dcf000e051b2
+Z f2c9fcc16d2a69d031b97db5b7833d47

diff --git a/manifest.uuid b/manifest.uuid
index 3bc1bd6a4b8d5df24e974523b97d2bf5f0ee3350..dc4a2a4a8a55b96df91ca8982d635faddff898c2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5c22132eb171058f30ec5b7562b8164611236748
\ No newline at end of file
+5c5c1f72797e4ceb229b8e3a7c65e5f173bb9e1a
\ No newline at end of file

diff --git a/src/os_win.c b/src/os_win.c
index 15400f4d36f7c862c064634fbc06841503684799..d90023604cb6f90e734c1383e21bc07d3025d6fc 100644 (file)
--- a/src/os_win.c
+++ b/src/os_win.c
@@ -12,7 +12,7 @@
 **
 ** This file contains code that is specific to windows.
 **
-** $Id: os_win.c,v 1.129 2008/06/26 10:41:19 danielk1977 Exp $
+** $Id: os_win.c,v 1.130 2008/07/18 23:47:43 drh Exp $
 */
 #include "sqliteInt.h"
 #if SQLITE_OS_WIN               /* This file is used for windows only */
@@ -1423,11 +1423,7 @@ static void *winDlOpen(sqlite3_vfs *pVfs, const char *zFilename){
   if( isNT() ){
     h = LoadLibraryW((WCHAR*)zConverted);
   }else{
-#if SQLITE_OS_WINCE
-    return 0;
-#else
     h = LoadLibraryA((char*)zConverted);
-#endif
   }
   free(zConverted);
   return (void*)h;