PennMUSH Community
Show
Ignore:
Timestamp:
07/08/07 20:50:12 (1 year ago)
Author:
shawnw
Message:

Merged 1.8.3p4 into trunk

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • 1.8.3/trunk/win32/config.h

    r919 r1032  
    111111 
    112112#define intmax_t __int64 
    113  
    114113#define uintmax_t unsigned __int64 
    115114 
     
    268267/* Misc. */ 
    269268 
    270 #define HAVE_SOCKADDR_IN6 
     269#undef HAVE_SOCKADDR_IN6 
    271270 
    272271#undef FORCE_IPV4 
     
    285284 
    286285/* Optional language features */ 
    287 #undef restrict 
     286#define restrict 
    288287#undef inline 
     288#ifndef _SSIZE_T_DEFINED 
     289#ifdef  _WIN64 
     290typedef __int64 ssize_t; 
     291#else 
     292typedef int ssize_t; 
     293#endif 
     294#define _SSIZE_T_DEFINED 
     295#endif 
    289296 
    290297#ifdef _MSC_VER