Remove unused #defines from os.h.

FossilOrigin-Name: c0891296b49fb95917db8a881425f8131cbf6de7

diff --git a/manifest b/manifest
index ffe0e4775e16c4b7cf92e0fbea1c5fa684be5c01..010e2bf8883a34d0659e6d10f903164427547b6a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sspurious\serrors\sthat\smay\soccur\sif\san\sempty\sdatabase\sis\sopened\sand\sthen\sinitialized\sas\sa\sWAL\sdatabase\sby\sa\ssecond\sconnection.
-D 2012-02-28T17:57:34.628
+C Remove\sunused\s#defines\sfrom\sos.h.
+D 2012-03-01T18:16:48.199
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 3f79a373e57c3b92dabf76f40b065e719d31ac34
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -163,7 +163,7 @@ F src/mutex_unix.c c3a4e00f96ba068a8dbef34084465979aaf369cc
 F src/mutex_w32.c 5e54f3ba275bcb5d00248b8c23107df2e2f73e33
 F src/notify.c 976dd0f6171d4588e89e874fcc765e92914b6d30
 F src/os.c e1acdc09ff3ac2412945cca9766e2dcf4675f31c
-F src/os.h 59beba555b65a450bd1d804220532971d4299f60
+F src/os.h 3b152a1b6d426228c1d10d75cdcc7adcc89b8e8c
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_os2.c 4a75888ba3dfc820ad5e8177025972d74d7f2440
 F src/os_unix.c 0e3d2942d228d0366fb80a3640f35caf413b66d1
@@ -991,7 +991,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P c267893a0813beb1764071409025e178318e1ca3
-R 751c4f9505bcae82ab2d498f42151225
-U dan
-Z aacac9f6818b59f3fbe792ef77401913
+P 16330a2f7262173a32ae48a72c0ee2522b6dc554
+R dcd6f3533b75ce35c1c4bbf3bf0513ac
+U drh
+Z bd5dc6273ea797f2f01bb9f1d730a750

diff --git a/manifest.uuid b/manifest.uuid
index df6fdce3eee58e160c13938612d2997fa67eee0a..310ebb570223ac761e2ce662ff13d260432523d3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-16330a2f7262173a32ae48a72c0ee2522b6dc554
\ No newline at end of file
+c0891296b49fb95917db8a881425f8131cbf6de7
\ No newline at end of file

diff --git a/src/os.h b/src/os.h
index 7dc0c8c2fbd52122031af43ced9d775c79503409..5ccb442f1fdc72db2f4cd4c7a15767071e1de5b2 100644 (file)
--- a/src/os.h
+++ b/src/os.h
@@ -65,30 +65,6 @@
 # endif
 #endif
 
-/*
-** Define the maximum size of a temporary filename
-*/
-#if SQLITE_OS_WIN
-# include <windows.h>
-# define SQLITE_TEMPNAME_SIZE (MAX_PATH+50)
-#elif SQLITE_OS_OS2
-# if (__GNUC__ > 3 || __GNUC__ == 3 && __GNUC_MINOR__ >= 3) && defined(OS2_HIGH_MEMORY)
-#  include <os2safe.h> /* has to be included before os2.h for linking to work */
-# endif
-# define INCL_DOSDATETIME
-# define INCL_DOSFILEMGR
-# define INCL_DOSERRORS
-# define INCL_DOSMISC
-# define INCL_DOSPROCESS
-# define INCL_DOSMODULEMGR
-# define INCL_DOSSEMAPHORES
-# include <os2.h>
-# include <uconv.h>
-# define SQLITE_TEMPNAME_SIZE (CCHMAXPATHCOMP)
-#else
-# define SQLITE_TEMPNAME_SIZE 200
-#endif
-
 /*
 ** Determine if we are dealing with Windows NT.
 **