ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/global.h
(Generate patch)

Comparing deliantra/server/include/global.h (file contents):
Revision 1.19 by root, Sun Oct 15 02:16:35 2006 UTC vs.
Revision 1.20 by pippijn, Mon Dec 11 19:46:46 2006 UTC

72typedef signed char sint8; 72typedef signed char sint8;
73#define SINT8_MAX 127 73#define SINT8_MAX 127
74 74
75typedef unsigned short Fontindex; 75typedef unsigned short Fontindex;
76 76
77#ifdef WIN32
78/* Python plugin stuff defines SIZEOF_LONG_LONG as 8, and besides __int64 is a 64b type on MSVC...
79 * So let's force the typedef */
80typedef unsigned __int64 uint64;
81typedef signed __int64 sint64;
82/* Needed for experience */
83#define atoll _atoi64
84
85/* To reduce number of warnings */
86#pragma warning( disable: 4244 ) /* conversion from 'xxx' to 'yyy', possible loss of data */
87#pragma warning( disable: 4305 ) /* initializing float f = 0.05; instead of f = 0.05f; */
88
89#else /* WIN32 */
90
91#if SIZEOF_LONG == 8 77#if SIZEOF_LONG == 8
92typedef unsigned long uint64; 78typedef unsigned long uint64;
93typedef signed long sint64; 79typedef signed long sint64;
94#elif SIZEOF_LONG_LONG == 8 80#elif SIZEOF_LONG_LONG == 8
95typedef unsigned long long uint64; 81typedef unsigned long long uint64;
97#else 83#else
98#error do not know how to get a 64 bit value on this system. 84#error do not know how to get a 64 bit value on this system.
99#error correct and send mail to crossfire-devel on how to do this 85#error correct and send mail to crossfire-devel on how to do this
100#endif 86#endif
101 87
102#endif
103
104#include <vector> 88#include <vector>
105 89
106#define ACC_CLASS(name) 90#define ACC_CLASS(name)
107#define ACC(meta,member) member 91#define ACC(meta,member) member
108 92
280#else 264#else
281# define CALLOC(x,y) malloc(x*y) 265# define CALLOC(x,y) malloc(x*y)
282# define CFREE(x) free(x) 266# define CFREE(x) free(x)
283#endif 267#endif
284 268
285#ifndef WIN32 /* ---win32 we define this stuff in win32.h */
286#if HAVE_DIRENT_H 269#if HAVE_DIRENT_H
287# include <dirent.h> 270# include <dirent.h>
288# define NAMLEN(dirent) strlen((dirent)->d_name) 271# define NAMLEN(dirent) strlen((dirent)->d_name)
289#else 272#else
290# define dirent direct 273# define dirent direct
296# include <sys/dir.h> 279# include <sys/dir.h>
297# endif 280# endif
298# if HAVE_NDIR_H 281# if HAVE_NDIR_H
299# include <ndir.h> 282# include <ndir.h>
300# endif 283# endif
301#endif
302#endif 284#endif
303 285
304typedef struct Settings { 286typedef struct Settings {
305 char *logfilename; /* logfile to use */ 287 char *logfilename; /* logfile to use */
306 uint16 csport; /* port for new client/server */ 288 uint16 csport; /* port for new client/server */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines