more NetBSD touchups
Brought to you by:
johnston
|
From: <ivt...@li...> - 2000-01-17 21:36:55
|
Patch: ivtools-000117-johnston-011
For: ivtools-0.7.10
Author: joh...@us...
This is an intermediate patch to ivtools-0.7.10. To apply, cd to the
top-level directory of the ivtools source tree (the directory with src
and config subdirs), and apply like this:
patch -s <ThisFile
Summary of Changes:
- last of the NetBSD fixes?
Index: src_tiff/tiffcompat.h
diff -c src_tiff/tiffcompat.h:1.1 src_tiff/tiffcompat.h:1.2
*** src_tiff/tiffcompat.h:1.1 Mon Jan 17 21:42:18 2000
--- src/TIFF/tiffcompat.h Mon Jan 17 21:42:18 2000
***************
*** 152,158 ****
--- 152,160 ----
#define lseek mpw_lseek
extern long mpw_lseek(int, long, int);
#else
+ if !defined(__NetBSD__)
extern long lseek();
+ #endif
#endif
/*
Index: include_std/nan.h
diff -c include_std/nan.h:1.2 include_std/nan.h:1.3
*** include_std/nan.h:1.2 Mon Jan 17 21:42:48 2000
--- src/include/ivstd/nan.h Mon Jan 17 21:42:48 2000
***************
*** 9,15 ****
#include <math.h>
#endif
! #if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__)
#define isnanorinf(dval) (isnan(dval)||isinf(dval))
#elif defined(__alpha)
#define isnanorinf(dval) (IsNANorINF(dval))
--- 9,15 ----
#include <math.h>
#endif
! #if defined(__sun__) && defined(__svr4__) || defined(__CYGWIN__) || defined(__linux__) || defined(__NetBSD)
#define isnanorinf(dval) (isnan(dval)||isinf(dval))
#elif defined(__alpha)
#define isnanorinf(dval) (IsNANorINF(dval))
Index: config_iv/TIFF.def
diff -c config_iv/TIFF.def:1.2 config_iv/TIFF.def:1.3
*** config_iv/TIFF.def:1.2 Mon Jan 17 21:42:56 2000
--- config/InterViews/TIFF.def Mon Jan 17 21:42:56 2000
***************
*** 121,131 ****
-DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT \
-DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=0
#endif
- #if defined(AlphaArchitecture)
- #define TIFFStdCDefines \
- -DCOLORIMETRY_SUPPORT -DYCBCR_SUPPORT \
- -DHAVE_IEEEFP=1 -DUSE_VARARGS=1 -DUSE_PROTOTYPES=0
- #endif
#if defined(NeXTArchitecture)
#define TIFFStdCDefines \
-DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
--- 121,126 ----
***************
*** 145,150 ****
--- 140,150 ----
#if defined(CygwinArchitecture)
#define TIFFStdCDefines \
-DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
+ -DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
+ #endif
+ #if defined(NetBSDArchitecture)
+ #define TIFFStdCDefines \
+ -DCOLORIMETRY_SUPPORT -DJPEG_SUPPORT -DYCBCR_SUPPORT -DCMYK_SUPPORT \
-DHAVE_IEEEFP=1 -DUSE_VARARGS=0 -DUSE_PROTOTYPES=1 -DUSE_CONST=1
#endif
|