Changeset 561 for trunk/src/3rdparty/libtiff

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/3rdparty/libtiff/libtiff/tif_config.h (modified) (2 diffs)
• src/3rdparty/libtiff/libtiff/tif_unix.c (modified) (1 diff)
• src/3rdparty/libtiff/libtiff/tiffio.h (modified) (1 diff)

trunk/src/3rdparty/libtiff/libtiff/tif_config.h

@@ -105 +105 @@
 
 /* Define to 1 if you have the <search.h> header file. */
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS)
 #define HAVE_SEARCH_H 1
 #endif
@@ -285 +285 @@
 /* Define to `__inline__' or `__inline' if that's what the C compiler
    calls it, or to nothing if 'inline' is not supported under any name.  */
+#ifndef Q_OS_SYMBIAN
 #ifndef __cplusplus
 #undef inline
 #define inline
 #endif
+#endif
 
 /* Define to `long' if <sys/types.h> does not define. */

trunk/src/3rdparty/libtiff/libtiff/tif_unix.c

@@ -182 +182 @@
 }
 
-#ifdef __WIN32__
+#if defined (__WIN32__) && !defined(__SYMBIAN32__)
 #include <windows.h>
 /*

trunk/src/3rdparty/libtiff/libtiff/tiffio.h

@@ -71 +71 @@
 #define __WIN32__
 #endif
+
+#include <stdlib.h>
 
 /*