Win32 I/O - remove ntfile routines and _iob from .def files. Standard calls now work

config.h.win32

@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: config.h.win32,v 1.6 2001/07/26 03:15:03 mayer Exp $ */
+/* $Id: config.h.win32,v 1.7 2001/11/02 05:02:15 mayer Exp $ */
 
 /*
  * win32 configuration file
@@ -187,21 +187,11 @@ typedef long off_t;
 #include <isc/ntpaths.h>
 #endif
 
-/*
- * Outside of lib isc we need to redefine these functions
- * This is due to the way _iob is set up
- */
-#if !defined(LIBISC_EXPORTS) && !defined(LIBLWRES_EXPORTS)
-
-#include <isc/ntfile.h>
-
-#else
 #define fdopen	_fdopen
 #define read	_read
 #define open	_open
 #define close	_close
 #define write	_write
-#endif
 
 #ifndef _WINSOCKAPI_
 #define _WINSOCKAPI_   /* Prevent inclusion of winsock.h in windows.h */

lib/isc/win32/libisc.def

@@ -396,29 +396,7 @@ openlog
 syslog
 closelog
 isc_syslog_facilityfromstring
-isc_ntfile_fopen
-isc_ntfile_fclose
-isc_ntfile_fwrite
-isc_ntfile_fread
-isc_ntfile_fseek
-isc_ntfile_flush
-isc_ntfile_sync
-isc_ntfile_printf
-isc_ntfile_fprintf
-isc_ntfile_vfprintf
-isc_ntfile_getaddress
-isc_ntfile_getc
-isc_ntfile_fgetc
-isc_ntfile_fgets
-isc_ntfile_fputc
-isc_ntfile_fputs
-isc_ntfile_fgetpos
-isc_ntfile_freopen
-isc_ntfile_fdopen
-isc_ntfile_open
-isc_ntfile_close
-isc_ntfile_read
-isc_ntfile_write
+
 isc_file_truncate
 isc__strerror
 
@@ -426,11 +404,7 @@ isc__strerror
 
 EXPORTS
 
-;isc_categories
-;isc_lctx
-;isc_modules
-
-isc_mem_debugging			DATA
+isc_mem_debugging		DATA
 
 isc_commandline_index	
 isc_commandline_option		DATA
@@ -439,5 +413,4 @@ isc_commandline_progname	DATA
 isc_commandline_errprint	DATA
 isc_commandline_reset		DATA
 isc_assertion_failed		DATA
-_iob						DATA
 			

lib/isc/win32/libisc.dsp

@@ -141,10 +141,6 @@ SOURCE=.\net.c
 # End Source File
 # Begin Source File
 
-SOURCE=.\ntfile.c
-# End Source File
-# Begin Source File
-
 SOURCE=.\ntpaths.c
 # End Source File
 # Begin Source File
@@ -373,10 +369,6 @@ SOURCE=.\include\isc\netdb.h
 # End Source File
 # Begin Source File
 
-SOURCE=.\include\isc\ntfile.h
-# End Source File
-# Begin Source File
-
 SOURCE=.\include\isc\ntpaths.h
 # End Source File
 # Begin Source File

lib/isc/win32/libisc.mak

@@ -73,7 +73,6 @@ CLEAN :
 	-@erase "$(INTDIR)\mutexblock.obj"
 	-@erase "$(INTDIR)\net.obj"
 	-@erase "$(INTDIR)\netaddr.obj"
-	-@erase "$(INTDIR)\ntfile.obj"
 	-@erase "$(INTDIR)\ntpaths.obj"
 	-@erase "$(INTDIR)\once.obj"
 	-@erase "$(INTDIR)\ondestroy.obj"
@@ -131,7 +130,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\ipv6.obj" \
 	"$(INTDIR)\keyboard.obj" \
 	"$(INTDIR)\net.obj" \
-	"$(INTDIR)\ntfile.obj" \
 	"$(INTDIR)\ntpaths.obj" \
 	"$(INTDIR)\once.obj" \
 	"$(INTDIR)\os.obj" \
@@ -139,6 +137,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\socket.obj" \
 	"$(INTDIR)\stdio.obj" \
 	"$(INTDIR)\stdtime.obj" \
+	"$(INTDIR)\strerror.obj" \
 	"$(INTDIR)\syslog.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\time.obj" \
@@ -179,8 +178,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\symtab.obj" \
 	"$(INTDIR)\task.obj" \
 	"$(INTDIR)\taskpool.obj" \
-	"$(INTDIR)\timer.obj" \
-	"$(INTDIR)\strerror.obj"
+	"$(INTDIR)\timer.obj"
 
 "..\..\..\Build\Release\libisc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -269,8 +267,6 @@ CLEAN :
 	-@erase "$(INTDIR)\net.sbr"
 	-@erase "$(INTDIR)\netaddr.obj"
 	-@erase "$(INTDIR)\netaddr.sbr"
-	-@erase "$(INTDIR)\ntfile.obj"
-	-@erase "$(INTDIR)\ntfile.sbr"
 	-@erase "$(INTDIR)\ntpaths.obj"
 	-@erase "$(INTDIR)\ntpaths.sbr"
 	-@erase "$(INTDIR)\once.obj"
@@ -353,7 +349,6 @@ BSC32_SBRS= \
 	"$(INTDIR)\ipv6.sbr" \
 	"$(INTDIR)\keyboard.sbr" \
 	"$(INTDIR)\net.sbr" \
-	"$(INTDIR)\ntfile.sbr" \
 	"$(INTDIR)\ntpaths.sbr" \
 	"$(INTDIR)\once.sbr" \
 	"$(INTDIR)\os.sbr" \
@@ -361,6 +356,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\socket.sbr" \
 	"$(INTDIR)\stdio.sbr" \
 	"$(INTDIR)\stdtime.sbr" \
+	"$(INTDIR)\strerror.sbr" \
 	"$(INTDIR)\syslog.sbr" \
 	"$(INTDIR)\thread.sbr" \
 	"$(INTDIR)\time.sbr" \
@@ -401,8 +397,7 @@ BSC32_SBRS= \
 	"$(INTDIR)\symtab.sbr" \
 	"$(INTDIR)\task.sbr" \
 	"$(INTDIR)\taskpool.sbr" \
-	"$(INTDIR)\timer.sbr" \
-	"$(INTDIR)\strerror.sbr"
+	"$(INTDIR)\timer.sbr"
 
 "$(OUTDIR)\libisc.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
     $(BSC32) @<<
@@ -426,7 +421,6 @@ LINK32_OBJS= \
 	"$(INTDIR)\ipv6.obj" \
 	"$(INTDIR)\keyboard.obj" \
 	"$(INTDIR)\net.obj" \
-	"$(INTDIR)\ntfile.obj" \
 	"$(INTDIR)\ntpaths.obj" \
 	"$(INTDIR)\once.obj" \
 	"$(INTDIR)\os.obj" \
@@ -434,6 +428,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\socket.obj" \
 	"$(INTDIR)\stdio.obj" \
 	"$(INTDIR)\stdtime.obj" \
+	"$(INTDIR)\strerror.obj" \
 	"$(INTDIR)\syslog.obj" \
 	"$(INTDIR)\thread.obj" \
 	"$(INTDIR)\time.obj" \
@@ -474,8 +469,7 @@ LINK32_OBJS= \
 	"$(INTDIR)\symtab.obj" \
 	"$(INTDIR)\task.obj" \
 	"$(INTDIR)\taskpool.obj" \
-	"$(INTDIR)\timer.obj" \
-	"$(INTDIR)\strerror.obj"
+	"$(INTDIR)\timer.obj"
 
 "..\..\..\Build\Debug\libisc.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
     $(LINK32) @<<
@@ -715,22 +709,6 @@ SOURCE=.\net.c
 "$(INTDIR)\net.obj"	"$(INTDIR)\net.sbr" : $(SOURCE) "$(INTDIR)"
 
 
-!ENDIF 
-
-SOURCE=.\ntfile.c
-
-!IF  "$(CFG)" == "libisc - Win32 Release"
-
-
-"$(INTDIR)\ntfile.obj" : $(SOURCE) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "libisc - Win32 Debug"
-
-
-"$(INTDIR)\ntfile.obj"	"$(INTDIR)\ntfile.sbr" : $(SOURCE) "$(INTDIR)"
-
-
 !ENDIF 
 
 SOURCE=.\ntpaths.c