1.1 --- a/src/Port.h	Sun Mar 04 21:09:22 2012 -0600
     1.2 +++ b/src/Port.h	Sun Mar 04 22:32:01 2012 -0600
     1.3 @@ -13,9 +13,22 @@
     1.4  
     1.5  typedef unsigned char bool8;
     1.6  
     1.7 -#ifdef HAVE_STDINT_H
     1.8 +//#ifdef HAVE_STDINT_H
     1.9  #include <stdint.h>
    1.10  
    1.11 +// RLM combatibility junk
    1.12 +
    1.13 +typedef uint8_t u8;
    1.14 +typedef uint16_t u16;
    1.15 +typedef uint32_t u32;
    1.16 +typedef uint64_t u64;
    1.17 +
    1.18 +typedef int8_t s8;
    1.19 +typedef int16_t s16;
    1.20 +typedef int32_t s32;
    1.21 +typedef int64_t s64;
    1.22 +
    1.23 +
    1.24  typedef int8_t   int8;
    1.25  typedef uint8_t  uint8;
    1.26  typedef int16_t  int16;
    1.27 @@ -26,55 +39,6 @@
    1.28  typedef uint64_t uint64;
    1.29  typedef intptr_t pint;
    1.30  
    1.31 -#else /* Don't have stdint.h */
    1.32 -
    1.33 -#ifdef PTR_NOT_INT
    1.34 -typedef long pint;
    1.35 -#else /* pointer is int */
    1.36 -typedef int pint;
    1.37 -#endif /* PTR_NOT_INT */
    1.38 -
    1.39 -/* FIXME: Refactor this by moving out the BORLAND part and unifying typedefs */
    1.40 -#ifndef WIN32
    1.41 -typedef unsigned char  uint8;
    1.42 -typedef unsigned short uint16;
    1.43 -typedef signed char    int8;
    1.44 -typedef short          int16;
    1.45 -typedef int            int32;
    1.46 -typedef unsigned int   uint32;
    1.47 -# ifdef __GNUC__  /* long long is not part of ISO C++ */
    1.48 -__extension__ typedef long long          int64;
    1.49 -__extension__ typedef unsigned long long uint64;
    1.50 -# else
    1.51 -typedef long long          int64;
    1.52 -typedef unsigned long long uint64;
    1.53 -# endif
    1.54 -#else /* WIN32 */
    1.55 -
    1.56 -# ifdef __BORLANDC__
    1.57 -#   include <systypes.h>
    1.58 -# else
    1.59 -
    1.60 -typedef unsigned char  uint8;
    1.61 -typedef unsigned short uint16;
    1.62 -typedef signed char    int8;
    1.63 -typedef short          int16;
    1.64 -
    1.65 -# ifndef WSAAPI
    1.66 -/* winsock2.h typedefs int32 as well. */
    1.67 -typedef long int32;
    1.68 -# endif
    1.69 -
    1.70 -typedef unsigned int uint32;
    1.71 -
    1.72 -# endif /* __BORLANDC__ */
    1.73 -
    1.74 -typedef __int64          int64;
    1.75 -typedef unsigned __int64 uint64;
    1.76 -
    1.77 -#endif /* WIN32 */
    1.78 -#endif /* HAVE_STDINT_H */
    1.79 -
    1.80  #ifndef WIN32
    1.81  
    1.82  #ifndef PATH_MAX
    1.83 @@ -98,14 +62,6 @@
    1.84  #define strncasecmp strnicmp
    1.85  #endif
    1.86  
    1.87 -typedef uint8  u8;
    1.88 -typedef uint16 u16;
    1.89 -typedef uint32 u32;
    1.90 -typedef uint64 u64;
    1.91 -typedef int8   s8;
    1.92 -typedef int16  s16;
    1.93 -typedef int32  s32;
    1.94 -typedef int64  s64;
    1.95  
    1.96  // for consistency
    1.97  static inline u8 swap8(u8 v)