--- deliantra/server/include/global.h 2006/10/15 02:16:35 1.19 +++ deliantra/server/include/global.h 2006/12/11 19:46:46 1.20 @@ -74,20 +74,6 @@ typedef unsigned short Fontindex; -#ifdef WIN32 -/* Python plugin stuff defines SIZEOF_LONG_LONG as 8, and besides __int64 is a 64b type on MSVC... - * So let's force the typedef */ -typedef unsigned __int64 uint64; -typedef signed __int64 sint64; -/* Needed for experience */ -#define atoll _atoi64 - -/* To reduce number of warnings */ -#pragma warning( disable: 4244 ) /* conversion from 'xxx' to 'yyy', possible loss of data */ -#pragma warning( disable: 4305 ) /* initializing float f = 0.05; instead of f = 0.05f; */ - -#else /* WIN32 */ - #if SIZEOF_LONG == 8 typedef unsigned long uint64; typedef signed long sint64; @@ -99,8 +85,6 @@ #error correct and send mail to crossfire-devel on how to do this #endif -#endif - #include #define ACC_CLASS(name) @@ -282,7 +266,6 @@ # define CFREE(x) free(x) #endif -#ifndef WIN32 /* ---win32 we define this stuff in win32.h */ #if HAVE_DIRENT_H # include # define NAMLEN(dirent) strlen((dirent)->d_name) @@ -299,7 +282,6 @@ # include # endif #endif -#endif typedef struct Settings { char *logfilename; /* logfile to use */