diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-12-29 15:22:18 +0000 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2020-12-29 15:22:18 +0000 |
| commit | f2bc2e9d6b34d1f70ad2d48237a21dfdcfaed9c8 (patch) | |
| tree | c861e4f61923ae0a69735ed20b9783f87117faa0 | |
| parent | b10bf3ab80094edace1978d0f3a5693b7f367580 (diff) | |
| parent | 66a9f0f8e0033fb685e7a3251fcea04c7702d19e (diff) | |
| download | libtiff-git-f2bc2e9d6b34d1f70ad2d48237a21dfdcfaed9c8.tar.gz | |
Merge branch 'remove-some-vms-ifdef' into 'master'
Remove "ifdef VMS" that are no longer necessary.
See merge request libtiff/libtiff!181
| -rw-r--r-- | libtiff/tif_codec.c | 4 | ||||
| -rw-r--r-- | libtiff/tiffiop.h | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/libtiff/tif_codec.c b/libtiff/tif_codec.c index 1ed3aa42..f698926d 100644 --- a/libtiff/tif_codec.c +++ b/libtiff/tif_codec.c @@ -80,11 +80,7 @@ static int NotConfigured(TIFF*, int); /* * Compression schemes statically built into the library. */ -#ifdef VMS const TIFFCodec _TIFFBuiltinCODECS[] = { -#else -const TIFFCodec _TIFFBuiltinCODECS[] = { -#endif { "None", COMPRESSION_NONE, TIFFInitDumpMode }, { "LZW", COMPRESSION_LZW, TIFFInitLZW }, { "PackBits", COMPRESSION_PACKBITS, TIFFInitPackBits }, diff --git a/libtiff/tiffiop.h b/libtiff/tiffiop.h index ab10c580..23841f59 100644 --- a/libtiff/tiffiop.h +++ b/libtiff/tiffiop.h @@ -456,11 +456,7 @@ extern int TIFFInitZSTD(TIFF*, int); #ifdef WEBP_SUPPORT extern int TIFFInitWebP(TIFF*, int); #endif -#ifdef VMS extern const TIFFCodec _TIFFBuiltinCODECS[]; -#else -extern const TIFFCodec _TIFFBuiltinCODECS[]; -#endif #if defined(__cplusplus) } |