adaption for CW 8.3 and quick hack for unicode text control size

[wxWidgets.git] / src / tiff / tiffiop.h

diff --git a/src/tiff/tiffiop.h b/src/tiff/tiffiop.h
index 91264785f3555e457e5b5eced421e48ae5d608ef..cb0a20c079816c6696215e4e35799cc4343c6cf2 100644 (file)
--- a/src/tiff/tiffiop.h
+++ b/src/tiff/tiffiop.h
@@ -34,7 +34,7 @@
  * a port.h file that reflects the system capabilities.
  * Doing this obviates all the dreck done in tiffcomp.h.
  */
-#if defined(unix) || defined(__unix)
+#if (defined(unix) || defined(__unix)) && !defined(__DJGPP__)
 #include "port.h"
 #include "tiffconf.h"
 #else
@@ -213,7 +213,7 @@ extern      void _TIFFSwab64BitData(TIFF*, tidata_t, tsize_t);
 extern int  TIFFFlushData1(TIFF*);
 extern void  TIFFFreeDirectory(TIFF*);
 extern int  TIFFDefaultDirectory(TIFF*);
-extern int  TIFFSetCompressionScheme(TIFF*, int);
+extern int  TIFFSetCompressionScheme(TIFF*, uint16);
 extern int  TIFFSetDefaultCompressionState(TIFF*);
 extern uint32 _TIFFDefaultStripSize(TIFF*, uint32);
 extern void _TIFFDefaultTileSize(TIFF*, uint32*, uint32*);