Use src/lib/w32/w32io.c for client

[empserver] / src / lib / w32 / unistd.h

diff --git a/src/lib/w32/unistd.h b/src/lib/w32/unistd.h
index 963c07b0862d132e633cb095e7b5097362d8f8db..eeb1c6e1bf76b43ef1bf1757394b73f82c52106e 100644 (file)
--- a/src/lib/w32/unistd.h
+++ b/src/lib/w32/unistd.h
@@ -46,25 +46,18 @@
  * breaks if the system's declaration is included later.  Include them
  * here.  Major name space pollution, can't be helped.
  */
+#include <getopt.h>
 #include <io.h>
 #include <direct.h>
 #include <sys/stat.h>
-
-#include "w32misc.h"
-
-/*
- * getopt.c
- */
-extern int getopt(int, char * const[], const char *);
-extern char *optarg;
-extern int optind, opterr, optopt;
+#include "w32types.h"
 
 /*
- * posixfile.c
+ * w32file.c
  */
 /* Should be in sys/stat.h */
-#define mkdir(dir, perm)    posix_mkdir((dir), (perm))
-extern int posix_mkdir(const char *dirname, mode_t perm);
+#define mkdir(dir, perm)    w32_mkdir((dir), (perm))
+extern int w32_mkdir(const char *dirname, mode_t perm);
 
 /* Should be in sys/stat.h */
 #ifndef S_IRUSR
@@ -95,14 +88,12 @@ extern int posix_mkdir(const char *dirname, mode_t perm);
 extern int fcntl(int fd, int cmd, ...);
 
 /* Stuff that actually belongs here */
-#define close(fd) \
-    posix_close((fd))
-#define read   posix_read
-extern ssize_t posix_read(int, void *, size_t);
-#define write(fd, buffer, count) \
-    posix_write((fd), (buffer), (count))
-extern ssize_t posix_write(int, const void *, size_t);
-extern int posix_close(int fd);
+#define close(fd) w32_close_function((fd))
+extern int (*w32_close_function)(int);
 #define ftruncate(fd, length) _chsize((fd), (length))
+#define read(fd, buf, sz) w32_read_function((fd), (buf), (sz))
+extern int (*w32_read_function)(int, void *, unsigned);
+#define write(fd, buf, sz) w32_write_function((fd), (buf), (sz))
+extern int (*w32_write_function)(int, const void *, unsigned);
 
 #endif /* UNISTD_H */