summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-21 05:21:25 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-21 05:21:25 (GMT)
commit5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (patch)
treed80717bf04339f767b92b5cc15c8d905eb3265af /src/3rdparty/libpng
parentb0743dd4e6f72108ac1fd989a418969fd241335d (diff)
downloadQt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.zip
Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.tar.gz
Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.tar.bz2
Revert "Hackish workaroung to Open C / C++ defect when intermixing standard"
This reverts commit 4dd03abdfbcc1af3075b30165e19ee63fe8051f4. And changes stl.prf slightly to get the Qt libs compiled again without reverted hack. Conflicts: src/gui/painting/qblackraster.c
Diffstat (limited to 'src/3rdparty/libpng')
-rw-r--r--src/3rdparty/libpng/pngconf.h5
1 files changed, 0 insertions, 5 deletions
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