projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
destroying native and wx controls
[wxWidgets.git]
/
src
/
tiff
/
tiffcomp.h
diff --git
a/src/tiff/tiffcomp.h
b/src/tiff/tiffcomp.h
index fc7198019fabfd5770e3c6015e5367339afcbb51..65d929cf38e5002d4f15882042b1e26cf6dde9a4 100644
(file)
--- a/
src/tiff/tiffcomp.h
+++ b/
src/tiff/tiffcomp.h
@@
-51,14
+51,14
@@
#define __acornriscos
#endif
#define __acornriscos
#endif
-#if
defined(__MWERKS__
) || defined(THINK_C)
+#if
(defined(__MWERKS__) && !defined(__MACH__)
) || defined(THINK_C)
#include <unix.h>
#include <math.h>
#endif
#include <stdio.h>
#include <unix.h>
#include <math.h>
#endif
#include <stdio.h>
-#if defined(__PPCC__) ||
defined(__SC__
) || defined(__MRC__)
+#if defined(__PPCC__) ||
( defined(__SC__) && !defined(__DMC__)
) || defined(__MRC__)
#include <types.h>
#elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
#include <sys/types.h>
#include <types.h>
#elif !defined(__MWERKS__) && !defined(THINK_C) && !defined(__acornriscos) && !defined(applec)
#include <sys/types.h>
@@
-79,14
+79,12
@@
* additional includes are also done to pull in the
* appropriate definitions we're looking for.
*/
* additional includes are also done to pull in the
* appropriate definitions we're looking for.
*/
-#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) ||
defined(__SC__
) || defined(__MRC__)
+#if defined(__MWERKS__) || defined(THINK_C) || defined(__PPCC__) ||
( defined(__SC__) && !defined(__DMC__)
) || defined(__MRC__)
#include <stdlib.h>
#define BSDTYPES
#define HAVE_UNISTD_H 0
#include <stdlib.h>
#define BSDTYPES
#define HAVE_UNISTD_H 0
-#elif defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows)
-# if !defined(__MINGW32__) /* GRG */
-# define BSDTYPES
-# endif
+#elif (defined(_WINDOWS) || defined(__WIN32__) || defined(_Windows) || defined(_WIN32)) && !defined(unix)
+#define BSDTYPES
#elif defined(OS2_16) || defined(OS2_32)
#define BSDTYPES
#elif defined(__acornriscos)
#elif defined(OS2_16) || defined(OS2_32)
#define BSDTYPES
#elif defined(__acornriscos)
@@
-121,11
+119,17
@@
* then define BSDTYPES in your Makefile.
*/
#if defined(BSDTYPES)
* then define BSDTYPES in your Makefile.
*/
#if defined(BSDTYPES)
+# ifndef _BSDTYPES_DEFINED
+# ifndef __u_char_defined
typedef unsigned char u_char;
typedef unsigned short u_short;
typedef unsigned int u_int;
typedef unsigned long u_long;
typedef unsigned char u_char;
typedef unsigned short u_short;
typedef unsigned int u_int;
typedef unsigned long u_long;
-#endif
+# define __u_char_defined
+# endif /* __u_char_defined */
+# define _BSDTYPES_DEFINED
+# endif /* _BSDTYPES_DEFINED */
+#endif /* BSDTYPES */
/*
* dblparam_t is the type that a double precision
/*
* dblparam_t is the type that a double precision
@@
-133,7
+137,7
@@
typedef unsigned long u_long;
* stack (when coerced by the compiler).
*/
/* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */
* stack (when coerced by the compiler).
*/
/* Note: on MacPowerPC "extended" is undefined. So only use it for 68K-Macs */
-#if
defined(__SC__
) || defined(THINK_C)
+#if
( defined(__SC__) && !defined(__DMC__)
) || defined(THINK_C)
typedef extended dblparam_t;
#else
typedef double dblparam_t;
typedef extended dblparam_t;
#else
typedef double dblparam_t;