3 files changed, 12 insertions, 2 deletions
diff --git a/src/3rdparty/libtiff/libtiff/tif_config.h b/src/3rdparty/libtiff/libtiff/tif_config.h
index 689421c..9dbc469 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
 
diff --git a/src/3rdparty/libtiff/libtiff/tif_unix.c b/src/3rdparty/libtiff/libtiff/tif_unix.c
index 28de5c9..b60a0e1 100644
--- a/src/3rdparty/libtiff/libtiff/tif_unix.c
+++ b/src/3rdparty/libtiff/libtiff/tif_unix.c
@@ -35,7 +35,12 @@
 #endif
 
 #include <stdarg.h>
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#else
 #include <stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
 #include <sys/stat.h>
 
 #ifdef HAVE_UNISTD_H
@@ -181,7 +186,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..96223d7 100644
--- a/src/3rdparty/libtiff/libtiff/tiffio.h
+++ b/src/3rdparty/libtiff/libtiff/tiffio.h
@@ -71,6 +71,11 @@ typedef	uint32 toff_t;		/* file offset */
 #define __WIN32__
 #endif
 
+// Bug in stdlib.h, see more information from fixed_stdlib.h
+#if (defined __SYMBIAN32__ && !defined __cplusplus)
+#include <fixed_stdlib.h>
+#endif  // defined __SYMBIAN32__ && !defined __cplusplus
+
 /*
  * 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).