-Removing some unneeded headers (WIN_NT) or explaining why are needed

src/jrd/os/win32/path_utils.cpp

@@ -1,6 +1,6 @@
+
 #include "../jrd/os/path_utils.h"
-#include <windows.h>
+#include <io.h> // _access
-#include <io.h>
 
 /// The Win32 implementation of the path_utils abstraction.
 

src/lock/print.cpp

@@ -50,14 +50,9 @@
 #endif
 
 #include <sys/stat.h>
-#if !(defined WIN_NT)
-#include <sys/param.h>
-#endif
 
-#if (defined WIN_NT)
+#ifdef HAVE_SYS_PARAM_H
-#include <winbase.h>
+#  include <sys/param.h>
-#include <io.h>
-#include <process.h>
 #endif
 
 #ifndef FPRINTF

src/msgs/build_file.epp

@@ -60,7 +60,7 @@ static int global_file;
 // in jrd/file_params.h, it seems we are already out of sync!
 
 #ifdef WIN_NT
-#include <io.h>
+#include <io.h> // open, lseek, write, close
 #define FILENAME	"firebird.msg"
 const char* const locale_pattern = "%.8s.msg";
 const char path_separator = '\\';

src/qli/lex.cpp

@@ -60,7 +60,7 @@
 #endif
 
 #if (defined WIN_NT)
-#include <io.h>
+#include <io.h> // isatty
 #define UNIX_LINE	1
 #define PC_FILE_SEEK
 #endif

src/remote/inet.cpp

@@ -41,7 +41,7 @@
  *
  */
 /*
-$Id: inet.cpp,v 1.87 2003-11-15 20:16:29 skidder Exp $
+$Id: inet.cpp,v 1.88 2003-11-16 12:52:36 brodsom Exp $
 */
 #include "firebird.h"
 #include "../jrd/ib_stdio.h"
@@ -135,7 +135,6 @@ extern int h_errno;
 
 #ifdef WIN_NT
 #include <fcntl.h>
-#include <io.h>
 #include <process.h>
 #include <signal.h>
 #include "../utilities/install/install_nt.h"

src/utilities/common/cmd_util.cpp

@@ -31,13 +31,7 @@
 #include "../jrd/iberr.h"
 
 #ifdef WIN_NT
-#include <io.h>
-#include <windows.h>
 #include "../jrd/jrd_pwd.h"
-#ifdef TEXT
-#undef TEXT
-#endif
-#define TEXT		SCHAR
 #endif
 
 #ifndef INCLUDE_FB_BLK

src/utilities/gsec/gsec.h

@@ -28,10 +28,6 @@
 #include "../jrd/thd.h"
 #include "../jrd/thd_proto.h"
 
-#if (defined WIN_NT)
-#include <io.h>
-#endif
-
 #define GSEC_MSG_FAC	18
 #define MSG_LENGTH	128
 #define QUERY_LENGTH	256

src/utilities/gstat/dba.epp

@@ -62,9 +62,6 @@
 #endif
 
 #ifdef WIN_NT
-#include <io.h>
-#include <windows.h>
-#include <stdlib.h>
 #include "../jrd/jrd_pwd.h"
 #endif
 

src/utilities/ibmgr/ibmgr.h

@@ -19,17 +19,12 @@
  *
  * All Rights Reserved.
  * Contributor(s): ______________________________________.
- * $Id: ibmgr.h,v 1.2 2003-08-26 06:54:45 brodsom Exp $
+ * $Id: ibmgr.h,v 1.3 2003-11-16 12:55:56 brodsom Exp $
  */
 
 #ifndef _UTILITIES_IBMGR_H_
 #define _UTILITIES_IBMGR_H_
 
-
-#if (defined WIN_NT)
-#include <io.h>
-#endif
-
 #define OUTFILE			ib_stderr
 
 #define SYSDBA_USER_NAME	"SYSDBA"

src/utilities/nbackup.cpp

@@ -32,7 +32,7 @@
  *  Contributor(s):
  * 
  *
- *  $Id: nbackup.cpp,v 1.9 2003-10-02 10:17:40 aafemt Exp $
+ *  $Id: nbackup.cpp,v 1.10 2003-11-16 12:53:31 brodsom Exp $
  *
  */
  
@@ -65,10 +65,6 @@
 #include <errno.h>
 #endif
 
-#if defined(WIN_NT)
-#include <io.h>
-#endif
-
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0
 #endif

src/wal/walw.cpp

@@ -82,11 +82,6 @@
 #ifdef WIN_NT
 #include <process.h>
 #include <io.h> // lseek
-#include <windows.h>
-#ifdef TEXT
-#undef TEXT
-#endif
-#define TEXT	SCHAR
 #define ERRNO	GetLastError()
 #endif