a bunch of cleaning to get wayward unit tests passing on windows. not there yet.

[feisty_meow.git] / nucleus / library / application / windoze_helper.h

diff --git a/nucleus/library/application/windoze_helper.h b/nucleus/library/application/windoze_helper.h
index a02b29653f8782bf96ffa20f34abff536cee86b0..969501b55022ebcfa13f09c57ff968dacb7d4405 100644 (file)
--- a/nucleus/library/application/windoze_helper.h
+++ b/nucleus/library/application/windoze_helper.h
@@ -23,8 +23,11 @@
 // gnarly headers that are needed for certain types of compilation...
 
 //unix headers not needed in here for new purpose of file.
-#ifdef __UNIX__
+#ifndef _MSC_VER
   #include <unistd.h>
+  #ifdef __GNU_WINDOWS__
+    #include <sys/unistd.h>
+  #endif
 #endif
 #ifndef NO_XWINDOWS
   #ifdef __XWINDOWS__
@@ -38,6 +41,11 @@
   #ifndef STRICT
     #define STRICT
   #endif
+  // winsock support...
+  #undef FD_SETSIZE
+  #define FD_SETSIZE 1000
+    // if you don't set this, you can only select on a default of 64 sockets.
+  #include <winsock2.h>
   // windows headers...
   #define _WINSOCKAPI_  // make windows.h happy about winsock.
   #ifndef _AFXDLL
@@ -48,11 +56,6 @@
     #include <afx.h>
     #include <afxwin.h>
   #endif
-  // winsock support...
-  #undef FD_SETSIZE
-  #define FD_SETSIZE 1000
-    // if you don't set this, you can only select on a default of 64 sockets.
-  #include <winsock2.h>
 #endif
 
 // forward.
@@ -213,7 +216,9 @@ namespace application {
     #define BROADCAST_HANDLE HWND_BROADCAST
 
     enum known_operating_systems {
-      WIN_95, WIN_NT, WIN_2K, WIN_XP, WIN_SRV2K3, WIN_VISTA, WIN_SRV2K8,
+      WIN_95, WIN_NT, WIN_2K, WIN_XP, WIN_SRV2K3, WIN_VISTA, 
+///WIN_SRV2K8,
+      WIN_7, WIN_8, WIN_10,
       UNKNOWN_OS
     };
     const char *opsystem_name(known_operating_systems which);