X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4d4e1be2ef7a40eecf85555a8eb3cef45202b422..db28a493dd741599370357dc56f88037a2767ec9:/src/tiff/tiffcomp.h diff --git a/src/tiff/tiffcomp.h b/src/tiff/tiffcomp.h index cb4a659191..0b1aa4c6c5 100644 --- a/src/tiff/tiffcomp.h +++ b/src/tiff/tiffcomp.h @@ -4,28 +4,28 @@ * Copyright (c) 1990-1997 Sam Leffler * Copyright (c) 1991-1997 Silicon Graphics, Inc. * - * Permission to use, copy, modify, distribute, and sell this software and + * Permission to use, copy, modify, distribute, and sell this software and * its documentation for any purpose is hereby granted without fee, provided * that (i) the above copyright notices and this permission notice appear in * all copies of the software and related documentation, and (ii) the names of * Sam Leffler and Silicon Graphics may not be used in any advertising or * publicity relating to the software without the specific, prior written * permission of Sam Leffler and Silicon Graphics. - * - * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, - * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY - * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. - * + * + * THE SOFTWARE IS PROVIDED "AS-IS" AND WITHOUT WARRANTY OF ANY KIND, + * EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY + * WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. + * * IN NO EVENT SHALL SAM LEFFLER OR SILICON GRAPHICS BE LIABLE FOR * ANY SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY KIND, * OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, - * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF - * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE + * WHETHER OR NOT ADVISED OF THE POSSIBILITY OF DAMAGE, AND ON ANY THEORY OF + * LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE * OF THIS SOFTWARE. */ #ifndef _COMPAT_ -#define _COMPAT_ +#define _COMPAT_ /* * This file contains a hodgepodge of definitions and * declarations that are needed to provide compatibility @@ -51,7 +51,7 @@ #define __acornriscos #endif -#if defined(__MWERKS__) || defined(THINK_C) +#if (defined(__MWERKS__) && !defined(__MACH__)) || defined(THINK_C) #include #include #endif @@ -87,6 +87,8 @@ #define BSDTYPES #elif defined(OS2_16) || defined(OS2_32) #define BSDTYPES +#elif defined(__MSDOS__) +#define BSDTYPES #elif defined(__acornriscos) #include #define BSDTYPES @@ -216,5 +218,8 @@ extern int creat(const char *path, int mode); #define HOST_BIGENDIAN 0 #endif +#ifndef LINKAGEMODE + #define LINKAGEMODE +#endif #endif /* _COMPAT_ */