diff options
author | axis <qt-info@nokia.com> | 2009-08-21 14:29:28 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-08-21 14:29:28 (GMT) |
commit | e190e700d707c3000f813c106c27d8f5aeda44d0 (patch) | |
tree | 63fa8d66040ca5680b0a1b3d108a17ec2139f1e9 /src/3rdparty/libtiff | |
parent | 71a8a5c97315c114d55190594a7175552bfd41a6 (diff) | |
parent | ae42be87658ad97fad48706141779ec42c02212e (diff) | |
download | Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.zip Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.gz Qt-e190e700d707c3000f813c106c27d8f5aeda44d0.tar.bz2 |
Merge branch 'master' of git@scm:qt/qt-s60-public
This brings support for the S60 platform into Qt.
Diffstat (limited to 'src/3rdparty/libtiff')
-rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_config.h | 4 | ||||
-rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_unix.c | 2 | ||||
-rw-r--r-- | src/3rdparty/libtiff/libtiff/tiffio.h | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h index 689421c..a6bb35d 100644 --- a/src/3rdparty/libtiff/libtiff/tif_config.h +++ b/src/3rdparty/libtiff/libtiff/tif_config.h @@ -104,7 +104,7 @@ /* #undef HAVE_PTHREAD */ /* Define to 1 if you have the <search.h> header file. */ -#if !defined(Q_OS_WINCE) && !defined(Q_OS_VXWORKS) +#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) && !defined(Q_OS_VXWORKS) #define HAVE_SEARCH_H 1 #endif @@ -284,10 +284,12 @@ /* 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. */ /* #undef off_t */ diff --git a/src/3rdparty/libtiff/libtiff/tif_unix.c b/src/3rdparty/libtiff/libtiff/tif_unix.c index 28de5c9..2c3bf7d 100644 --- a/src/3rdparty/libtiff/libtiff/tif_unix.c +++ b/src/3rdparty/libtiff/libtiff/tif_unix.c @@ -181,7 +181,7 @@ TIFFOpen(const char* name, const char* mode) return tif; } -#ifdef __WIN32__ +#if defined (__WIN32__) && !defined(__SYMBIAN32__) #include <windows.h> /* * Open a TIFF file with a Unicode filename, for read/writing. diff --git a/src/3rdparty/libtiff/libtiff/tiffio.h b/src/3rdparty/libtiff/libtiff/tiffio.h index 7aaf561..c0804ed 100644 --- a/src/3rdparty/libtiff/libtiff/tiffio.h +++ b/src/3rdparty/libtiff/libtiff/tiffio.h @@ -71,6 +71,8 @@ typedef uint32 toff_t; /* file offset */ #define __WIN32__ #endif +#include <stdlib.h> + /* * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c * or AVOID_WIN32_FILEIO if you are using something else (like tif_unix.c). |