X-Git-Url: https://feistymeow.org/gitweb/?a=blobdiff_plain;f=nucleus%2Flibrary%2Fapplication%2Fwindoze_helper.h;h=071e0fcdf0c43e4c781e62e0cc7d042689529b7f;hb=59d9850917f80fb9b7aa07cfbd7d615b0c830d05;hp=a02b29653f8782bf96ffa20f34abff536cee86b0;hpb=457b128b77b5b4a0b7dd3094de543de2ce1477ad;p=feisty_meow.git

diff --git a/nucleus/library/application/windoze_helper.h b/nucleus/library/application/windoze_helper.h
index a02b2965..071e0fcd 100644
--- 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.
@@ -137,9 +140,9 @@
 
 namespace application {
 
-//  istring module_name(const void *module_handle = NIL);
+//  istring module_name(const void *module_handle = NULL_POINTER);
     //!< returns the name of the module for the "module_handle" where supported.
-    /*!< if the handle is NIL, then the program name is returned. */
+    /*!< if the handle is NULL_POINTER, then the program name is returned. */
 
 
 //  u_int system_error();
@@ -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);