diff options
author | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-17 20:16:55 +0000 |
---|---|---|
committer | cyberbotx <cyberbotx@5417fbe8-f217-4b02-8779-1006273d7864> | 2008-12-17 20:16:55 +0000 |
commit | 2d72446860abac08dc4f36b10fde7536f7897956 (patch) | |
tree | 25dc114bb696bc8752d68e6e050da8d3dda5f282 /include/sysconf.h.cmake | |
parent | 1cd73b4dadb8e618a0ec56289408922be42aac8a (diff) |
More CMake work, mostly to handle both *nix and Windows builds.
Also some tweaks to generation files (like version.sh) to take both input and output files as arguments, to handle CMake when it's used for an out-of-source build.
git-svn-id: http://anope.svn.sourceforge.net/svnroot/anope/trunk@1836 5417fbe8-f217-4b02-8779-1006273d7864
Diffstat (limited to 'include/sysconf.h.cmake')
-rw-r--r-- | include/sysconf.h.cmake | 54 |
1 files changed, 52 insertions, 2 deletions
diff --git a/include/sysconf.h.cmake b/include/sysconf.h.cmake index b4241f4b2..e7464492d 100644 --- a/include/sysconf.h.cmake +++ b/include/sysconf.h.cmake @@ -26,6 +26,8 @@ // Temporary, remove from here later as well as elsewhere in the code #define DL_PREFIX "" +#cmakedefine HAVE_UINT8_T 1 +#cmakedefine HAVE_U_INT8_T 1 #cmakedefine HAVE_INT16_T 1 #cmakedefine HAVE_UINT16_T 1 #cmakedefine HAVE_U_INT16_T 1 @@ -43,10 +45,28 @@ # include <stddef.h> #endif +#ifdef HAVE_UINT8_T +typedef uint8_t uint8; +#else +# ifdef HAVE_U_INT8_T +typedef u_int8_t uint8; +# else +# ifdef _WIN32 +typedef unsigned __int8 uint8; +# else +typedef unsigned short uint8; +# endif +# endif +#endif + #ifdef HAVE_INT16_T typedef int16_t int16; #else -typedef short int16; +# ifdef _WIN32 +typedef signed __int16 int16; +# else +typedef int int16; +# endif #endif #ifdef HAVE_UINT16_T @@ -55,14 +75,22 @@ typedef uint16_t uint16; # ifdef HAVE_U_INT16_T typedef u_int16_t uint16; # else -typedef unsigned short uint16; +# ifdef _WIN32 +typedef unsigned __int16 uint16; +# else +typedef unsigned int uint16; +# endif # endif #endif #ifdef HAVE_INT32_T typedef int32_t int32; #else +# ifdef _WIN32 +typedef signed __int32 int32; +# else typedef long int32; +# endif #endif #ifdef HAVE_UINT32_T @@ -71,8 +99,30 @@ typedef uint32_t uint32; # ifdef HAVE_U_INT32_T typedef u_int32_t uint32; # else +# ifdef _WIN32 +typedef unsigned __int32 uint32; +# else typedef unsigned long uint32; +# endif +# endif +#endif + +#ifdef _WIN32 +# ifdef MSVCPP +# define snprintf _snprintf +# endif +# define popen _popen +# define pclose _pclose +# define ftruncate _chsize +# ifdef MSVCPP +# define PATH_MAX MAX_PATH +# endif +# define MAXPATHLEN MAX_PATH +# define bzero(buf, size) memset(buf, 0, size) +# ifdef MSVCPP +# define strcasecmp stricmp # endif +# define sleep(x) Sleep(x * 1000) #endif #endif |