| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121 |
- Author: Michael Karcher <debian@mkarcher.dialup.fu-berlin.de>
- Description: Replace declare.h by a generic stdint based version.
- Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=449395
- --- unace-nonfree-2.5.orig/source/base/all/declare.h
- +++ unace-nonfree-2.5/source/base/all/declare.h
- @@ -7,76 +7,47 @@
- #ifndef _DECLARE_H_INCLUDED
- #define _DECLARE_H_INCLUDED
-
- -#if !defined(__OS2__) && !defined(_WINDOWS_)
- - typedef int BOOL;
- +#include <stdint.h>
-
- - typedef char CHAR;
- - typedef unsigned char UCHAR;
- - typedef UCHAR *PUCHAR;
- - typedef char *PSZ;
- +typedef int BOOL;
- +typedef BOOL *PBOOL;
-
- - typedef short SHORT;
- - typedef unsigned short USHORT;
- - typedef USHORT *PUSHORT;
- -
- - typedef long LONG;
- - typedef unsigned long ULONG;
- -
- - typedef ULONG *PULONG;
- -
- - typedef int INT;
- - typedef unsigned int UINT;
- - typedef unsigned int *PUINT;
- -
- - typedef CHAR *LPSTR;
- -#endif
- -
- -#if __WATCOMC__==1060
- - typedef long __int64[2];
- - typedef __int64 LONGLONG;
- - typedef LONGLONG *PLONGLONG;
- - typedef __int64 ULONGLONG;
- - typedef ULONGLONG DWORDLONG;
- -#else
- - #if !defined(_WINDOWS_)
- - #if !defined(__WATCOMC__) && !defined(__int64)
- - #define __int64 long long
- - #endif
- -
- - typedef __int64 LONGLONG;
- - typedef LONGLONG *PLONGLONG;
- - typedef unsigned __int64 ULONGLONG;
- - typedef ULONGLONG DWORDLONG;
- - #endif
- -#endif
- -
- -
- -#if !defined(_WINDOWS_)
- - typedef BOOL *PBOOL;
- - typedef INT *PINT;
- -#endif
- -
- -#if !defined(__wtypes_h__)
- - typedef void *PVOID;
- - typedef CHAR *PCHAR;
- - typedef SHORT *PSHORT;
- - typedef LONG *PLONG;
- - typedef ULONGLONG *PULONGLONG;
- -#endif
- -
- -#if defined(_GNU_H_WINDOWS32_BASE)
- - typedef LONGLONG ULONGLONG;
- - typedef ULONGLONG *PULONGLONG;
- -#endif
- -
- -typedef signed char SCHAR;
- +typedef char CHAR;
- +typedef CHAR *PCHAR;
- +typedef unsigned char UCHAR;
- +typedef UCHAR *PUCHAR;
- +typedef signed char SCHAR;
- +typedef CHAR *PSZ;
- +typedef CHAR *LPSTR;
- +
- +typedef int INT;
- +typedef INT *PINT;
- +typedef unsigned int UINT;
- +typedef unsigned int *PUINT;
- +
- +typedef int16_t SHORT;
- +typedef SHORT *PSHORT;
- +typedef uint16_t USHORT;
- +typedef USHORT *PUSHORT;
- +
- +typedef int32_t LONG;
- +typedef LONG *PLONG;
- +typedef uint32_t ULONG;
- +typedef ULONG *PULONG;
- +
- +typedef int64_t LONGLONG;
- +typedef LONGLONG *PLONGLONG;
- +typedef uint64_t ULONGLONG;
- +typedef ULONGLONG *PULONGLONG;
- +
- +typedef void *PVOID;
- +
- +/* Dear ACE team, please clean your code to remove the following types */
- +typedef LONGLONG __int64;
- +typedef ULONGLONG DWORDLONG;
-
- #ifndef NULL
- - #if defined(__SMALL__) || defined(__MEDIUM__) || defined(__386__) || defined(__AXP__) || defined(__PPC__)
- - #define NULL 0
- - #else
- - #define NULL 0L
- - #endif
- +#include <stdlib.h>
- #endif
-
-
|
