diff options
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 1 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-global.h | 6 | ||||
| -rw-r--r-- | src/3rdparty/libjpeg/jinclude.h | 5 | ||||
| -rw-r--r-- | src/3rdparty/libmng/libmng_types.h | 7 | ||||
| -rw-r--r-- | src/3rdparty/libpng/pngconf.h | 5 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tif_unix.c | 5 | ||||
| -rw-r--r-- | src/3rdparty/libtiff/libtiff/tiffio.h | 5 | ||||
| -rw-r--r-- | src/3rdparty/zlib/zutil.h | 7 | ||||
| -rw-r--r-- | src/gui/painting/qgrayraster.c | 5 |
9 files changed, 3 insertions, 43 deletions
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 9eb6b86..6d7426b 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -5,7 +5,6 @@ CONFIG -= stl_off # MACRO _WCHAR_T_DECLARED QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS -DEFINES *= $$STLLIB_USAGE_DEFINES # Legacy support requires some hardcoded stdapis paths. # Note: Also the new header is used from STL when it is enabled diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-global.h b/src/3rdparty/harfbuzz/src/harfbuzz-global.h index 393cc7b..d4e6b46 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h @@ -28,13 +28,7 @@ #ifndef HARFBUZZ_GLOBAL_H #define HARFBUZZ_GLOBAL_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 <string.h> #ifdef __cplusplus diff --git a/src/3rdparty/libjpeg/jinclude.h b/src/3rdparty/libjpeg/jinclude.h index 725bd51..0a4f151 100644 --- a/src/3rdparty/libjpeg/jinclude.h +++ b/src/3rdparty/libjpeg/jinclude.h @@ -36,12 +36,7 @@ #endif #ifdef HAVE_STDLIB_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 #endif #ifdef NEED_SYS_TYPES_H diff --git a/src/3rdparty/libmng/libmng_types.h b/src/3rdparty/libmng/libmng_types.h index 45be543..81fb29f 100644 --- a/src/3rdparty/libmng/libmng_types.h +++ b/src/3rdparty/libmng/libmng_types.h @@ -198,12 +198,7 @@ #endif /* MNG_INCLUDE_IJG6B */ #if defined(MNG_INTERNAL_MEMMNGMT) || defined(MNG_INCLUDE_FILTERS) -// 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 <stdlib.h> /* "calloc" & "free" & "abs" */ #endif #include <limits.h> /* get proper integer widths */ diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index e680a05..066be02 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -353,12 +353,7 @@ /* Other defines for things like memory and the like can go here. */ #ifdef PNG_INTERNAL -// 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 /* The functions exported by PNG_EXTERN are PNG_INTERNAL functions, which * aren't usually used outside the library (as far as I know), so it is diff --git a/src/3rdparty/libtiff/libtiff/tif_unix.c b/src/3rdparty/libtiff/libtiff/tif_unix.c index b60a0e1..2c3bf7d 100644 --- a/src/3rdparty/libtiff/libtiff/tif_unix.c +++ b/src/3rdparty/libtiff/libtiff/tif_unix.c @@ -35,12 +35,7 @@ #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 diff --git a/src/3rdparty/libtiff/libtiff/tiffio.h b/src/3rdparty/libtiff/libtiff/tiffio.h index 96223d7..c0804ed 100644 --- a/src/3rdparty/libtiff/libtiff/tiffio.h +++ b/src/3rdparty/libtiff/libtiff/tiffio.h @@ -71,10 +71,7 @@ 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 +#include <stdlib.h> /* * On windows you should define USE_WIN32_FILEIO if you are using tif_win32.c diff --git a/src/3rdparty/zlib/zutil.h b/src/3rdparty/zlib/zutil.h index 3ecb1bb..b7d5eff 100644 --- a/src/3rdparty/zlib/zutil.h +++ b/src/3rdparty/zlib/zutil.h @@ -21,12 +21,7 @@ # include <stddef.h> # endif # include <string.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 <stdlib.h> #endif #ifdef NO_ERRNO_H # ifdef _WIN32_WCE diff --git a/src/gui/painting/qgrayraster.c b/src/gui/painting/qgrayraster.c index 7c960df..3d1b806 100644 --- a/src/gui/painting/qgrayraster.c +++ b/src/gui/painting/qgrayraster.c @@ -160,12 +160,7 @@ #include <private/qrasterdefs_p.h> #include <private/qgrayraster_p.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 <stdio.h> /* This macro is used to indicate that a function parameter is unused. */ |