From b8b249f49c2eb611b547beaef86096c1732dbfbe Mon Sep 17 00:00:00 2001 From: malaterre Date: Sun, 29 May 2005 22:09:32 +0000 Subject: [PATCH] ENH: Rework the header file...I guess some people refuse to read my emails... --- .../libjasper/include/jasper/jas_config.h.in | 23 +++---------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in index cc6c70a3..e3936565 100644 --- a/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in +++ b/src/gdcmjasper/src/libjasper/include/jasper/jas_config.h.in @@ -175,32 +175,15 @@ #ifndef HAVE_SYS_TYPES_H -#else -typedef unsigned char uchar; typedef unsigned short ushort; typedef unsigned int uint; typedef unsigned long ulong; -typedef long long longlong; -typedef unsigned long long ulonglong; -/* #define ssize_t int */ -#endif - -/* Something I don't uderstand (neither Benoit does ...) - The previous 'ifndef' causes warning with gcc, like : - /usr/include/sys/types.h:152: warning: `ushort' previously declared here - Commenting it out and uncommenting the following causes syntax error ?!? -*/ -/* -#if defined(_MSC_VER) || defined(__BORLANDC__) +#else typedef unsigned char uchar; -typedef unsigned short ushort; -typedef unsigned int uint; -typedef unsigned long ulong; -typedef long long longlong; typedef unsigned long long ulonglong; -#define UINT32_MAX (4294967295U) +typedef long long longlong; +/* #define ssize_t int */ #endif -*/ #endif -- 2.48.1