Remove some vestiges of the old OS_TEST driver. (CVS 2787)

FossilOrigin-Name: 008f676f20c690255e5cb8ae01df47c5094ac240

2 files changed, 5 insertions, 12 deletions

diff --git a/src/os.h b/src/os.h
index 0dce6578e..5db9fa458 100644
--- a/src/os.h
+++ b/src/os.h
@@ -23,7 +23,7 @@
 ** N.B. MacOS means Mac Classic (or Carbon). Treat Darwin (OS X) as Unix.
 **      The MacOS build is designed to use CodeWarrior (tested with v8)
 */
-#if !defined(OS_UNIX) && !defined(OS_TEST) && !defined(OS_OTHER)
+#if !defined(OS_UNIX) && !defined(OS_ALT)
 # define OS_OTHER 0
 # ifndef OS_WIN
 #   if defined(_WIN32) || defined(WIN32) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__BORLANDC__)
@@ -45,8 +45,8 @@
 /*
 ** Invoke the appropriate operating-system specific header file.
 */
-#if OS_TEST
-# include "os_test.h"
+#if OS_ALT
+# include "os_alt.h"
 #endif
 #if OS_UNIX
 # include "os_unix.h"
diff --git a/src/pager.c b/src/pager.c
index 9398e9950..17a5c3192 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
 ** file simultaneously, or one process from reading the database while
 ** another is writing.
 **
-** @(#) $Id: pager.c,v 1.219 2005/11/26 03:43:23 drh Exp $
+** @(#) $Id: pager.c,v 1.220 2005/11/26 03:51:19 drh Exp $
 */
 #ifndef SQLITE_OMIT_DISKIO
 #include "sqliteInt.h"
@@ -46,21 +46,14 @@
 
 /*
 ** The following two macros are used within the TRACEX() macros above
-** to print out file-descriptors. They are required so that tracing
-** can be turned on when using both the regular os_unix.c and os_test.c
-** backends.
+** to print out file-descriptors. 
 **
 ** PAGERID() takes a pointer to a Pager struct as it's argument. The
 ** associated file-descriptor is returned. FILEHANDLEID() takes an OsFile
 ** struct as it's argument.
 */
-#ifdef OS_TEST
-#define PAGERID(p) (p->fd->fd.h)
-#define FILEHANDLEID(fd) (fd->fd.h)
-#else
 #define PAGERID(p) (p->fd.h)
 #define FILEHANDLEID(fd) (fd.h)
-#endif
 
 /*
 ** The page cache as a whole is always in one of the following