Difference for include/global.h from version 1.66 to 1.67


version 1.66 version 1.67
Line 1
 
Line 1
 /*  /*
  * static char *rcsid_global_h =   * static char *rcsid_global_h =
  *   "$Id: global.h,v 1.66 2006/05/18 05:27:44 mwedel Exp $";   *   "$Id: global.h,v 1.67 2006/06/05 06:28:56 mwedel Exp $";
  */   */
   
 /*  /*
     CrossFire, A Multiplayer game for X-windows      CrossFire, A Multiplayer game for X-windows
   
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team      Copyright (C) 2006 Mark Wedel & Crossfire Development Team
     Copyright (C) 1992 Frank Tore Johansen      Copyright (C) 1992 Frank Tore Johansen
   
     This program is free software; you can redistribute it and/or modify      This program is free software; you can redistribute it and/or modify
Line 88
 
Line 88
 /* Needed for experience */  /* Needed for experience */
 #define atoll _atoi64  #define atoll _atoi64
   
   #define FMT64     "I64d"
   #define FMT64U     "I64u"
   
 /* To reduce number of warnings */  /* To reduce number of warnings */
 #pragma warning( disable: 4244 ) /* conversion from 'xxx' to 'yyy', possible loss of data */  #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; */  #pragma warning( disable: 4305 ) /* initializing float f = 0.05; instead of f = 0.05f; */
Line 95
 
Line 98
 #else /* WIN32 */  #else /* WIN32 */
   
 #if SIZEOF_LONG == 8  #if SIZEOF_LONG == 8
   
 typedef unsigned long     uint64;  typedef unsigned long     uint64;
 typedef signed long     sint64;  typedef signed long     sint64;
   #define FMT64     "ld"
   #define FMT64U     "ld"
   
 #elif SIZEOF_LONG_LONG == 8  #elif SIZEOF_LONG_LONG == 8
 typedef unsigned long long uint64;  typedef unsigned long long uint64;
 typedef signed long long sint64;  typedef signed long long sint64;
   #define FMT64     "lld"
   #define FMT64U     "lld"
   
 #else  #else
 #error do not know how to get a 64 bit value on this system.  #error do not know how to get a 64 bit value on this system.
 #error correct and send mail to crossfire-devel on how to do this  #error correct and send mail to crossfire-devel on how to do this
Line 247
 
Line 257
 extern New_Face *smooth_face;  extern New_Face *smooth_face;
   
   
 extern long max_time; /* loop time */  extern uint32 max_time; /* loop time */
 extern socket_struct *init_sockets;  extern socket_struct *init_sockets;
   
   


Legend:
line(s) removed in v.1.66 
line(s) changed
 line(s) added in v.1.67

File made using version 1.98 of cvs2html by leaf at 2011-07-21 19:21