projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added kdenlive
[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..071e0fcdf0c43e4c781e62e0cc7d042689529b7f 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.
// gnarly headers that are needed for certain types of compilation...
//unix headers not needed in here for new purpose of file.
-#if
def __UNIX__
+#if
ndef _MSC_VER
#include <unistd.h>
#include <unistd.h>
+ #ifdef __GNU_WINDOWS__
+ #include <sys/unistd.h>
+ #endif
#endif
#ifndef NO_XWINDOWS
#ifdef __XWINDOWS__
#endif
#ifndef NO_XWINDOWS
#ifdef __XWINDOWS__
@@
-38,6
+41,11
@@
#ifndef STRICT
#define STRICT
#endif
#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
// windows headers...
#define _WINSOCKAPI_ // make windows.h happy about winsock.
#ifndef _AFXDLL
@@
-48,11
+56,6
@@
#include <afx.h>
#include <afxwin.h>
#endif
#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.
#endif
// forward.
@@
-137,9
+140,9
@@
namespace application {
namespace application {
-// istring module_name(const void *module_handle = N
IL
);
+// istring module_name(const void *module_handle = N
ULL_POINTER
);
//!< returns the name of the module for the "module_handle" where supported.
//!< returns the name of the module for the "module_handle" where supported.
- /*!< if the handle is N
IL
, then the program name is returned. */
+ /*!< if the handle is N
ULL_POINTER
, then the program name is returned. */
// u_int system_error();
// u_int system_error();
@@
-213,7
+216,9
@@
namespace application {
#define BROADCAST_HANDLE HWND_BROADCAST
enum known_operating_systems {
#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);
UNKNOWN_OS
};
const char *opsystem_name(known_operating_systems which);