unace/trunk/04-64bit.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 04-64bit.dpatch by Michael Karcher
   3 ## <debian@mkarcher.dialup.fu-berlin.de>
   4 ##
   5 ## All lines beginning with `## DP:' are a description of the patch.
   6 ## DP: Replace declare.h by a generic stdint based version.
   7
   8 @DPATCH@
   9 diff -urNad unace-nonfree-2.5~/source/base/all/declare.h unace-nonfree-2.5/source/base/all/declare.h
  10 --- unace-nonfree-2.5~/source/base/all/declare.h        2007-11-06 00:11:47.000000000 +0100
  11 +++ unace-nonfree-2.5/source/base/all/declare.h 2007-11-06 00:13:18.498574104 +0100
  12 @@ -7,76 +7,47 @@
  13  #ifndef _DECLARE_H_INCLUDED
  14  #define _DECLARE_H_INCLUDED
  15
  16 -#if !defined(__OS2__) && !defined(_WINDOWS_)
  17 -  typedef int             BOOL;
  18 -
  19 -  typedef char               CHAR;
  20 -  typedef unsigned char      UCHAR;
  21 -  typedef UCHAR             *PUCHAR;
  22 -  typedef char              *PSZ;
  23 -
  24 -  typedef short              SHORT;
  25 -  typedef unsigned short     USHORT;
  26 -  typedef USHORT            *PUSHORT;
  27 -
  28 -  typedef long               LONG;
  29 -  typedef unsigned long      ULONG;
  30 -
  31 -  typedef ULONG             *PULONG;
  32 -
  33 -  typedef int                INT;
  34 -  typedef unsigned int       UINT;
  35 -  typedef unsigned int      *PUINT;
  36 +#include <stdint.h>
  37
  38 -  typedef CHAR              *LPSTR;
  39 -#endif
  40 +typedef int             BOOL;
  41 +typedef BOOL           *PBOOL;
  42
  43 -#if __WATCOMC__==1060
  44 -  typedef long               __int64[2];
  45 -  typedef __int64            LONGLONG;
  46 -  typedef LONGLONG          *PLONGLONG;
  47 -  typedef __int64            ULONGLONG;
  48 -  typedef ULONGLONG          DWORDLONG;
  49 -#else
  50 -  #if !defined(_WINDOWS_)
  51 -    #if !defined(__WATCOMC__) && !defined(__int64)
  52 -      #define __int64  long long
  53 -    #endif
  54 +typedef char               CHAR;
  55 +typedef CHAR              *PCHAR;
  56 +typedef unsigned char      UCHAR;
  57 +typedef UCHAR             *PUCHAR;
  58 +typedef signed char        SCHAR;
  59 +typedef CHAR              *PSZ;
  60 +typedef CHAR              *LPSTR;
  61
  62 -    typedef __int64            LONGLONG;
  63 -    typedef LONGLONG          *PLONGLONG;
  64 -    typedef unsigned __int64   ULONGLONG;
  65 -    typedef ULONGLONG          DWORDLONG;
  66 -  #endif
  67 -#endif
  68 +typedef int                INT;
  69 +typedef INT               *PINT;
  70 +typedef unsigned int       UINT;
  71 +typedef unsigned int      *PUINT;
  72
  73 +typedef int16_t            SHORT;
  74 +typedef SHORT             *PSHORT;
  75 +typedef uint16_t           USHORT;
  76 +typedef USHORT            *PUSHORT;
  77
  78 -#if !defined(_WINDOWS_)
  79 -  typedef BOOL           *PBOOL;
  80 -  typedef INT            *PINT;
  81 -#endif
  82 +typedef int32_t            LONG;
  83 +typedef LONG              *PLONG;
  84 +typedef uint32_t           ULONG;
  85 +typedef ULONG             *PULONG;
  86
  87 -#if !defined(__wtypes_h__)
  88 -  typedef void           *PVOID;
  89 -  typedef CHAR           *PCHAR;
  90 -  typedef SHORT          *PSHORT;
  91 -  typedef LONG           *PLONG;
  92 -  typedef ULONGLONG      *PULONGLONG;
  93 -#endif
  94 +typedef int64_t            LONGLONG;
  95 +typedef LONGLONG          *PLONGLONG;
  96 +typedef uint64_t           ULONGLONG;
  97 +typedef ULONGLONG         *PULONGLONG;
  98
  99 -#if defined(_GNU_H_WINDOWS32_BASE)
 100 -  typedef LONGLONG       ULONGLONG;
 101 -  typedef ULONGLONG      *PULONGLONG;
 102 -#endif
 103 +typedef void              *PVOID;
 104
 105 -typedef signed char     SCHAR;
 106 +/* Dear ACE team, please clean your code to remove the following types */
 107 +typedef LONGLONG           __int64;
 108 +typedef ULONGLONG          DWORDLONG;
 109
 110  #ifndef NULL
 111 - #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__)
 112 -  #define NULL   0
 113 - #else
 114 -  #define NULL   0L
 115 - #endif
 116 +#include <stdlib.h>
 117  #endif
 118
 119