summaryrefslogtreecommitdiffstats
path: root/src/3rdparty/libpng/pngconf.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/3rdparty/libpng/pngconf.h')
-rw-r--r--src/3rdparty/libpng/pngconf.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h
index 2a41a29..754f91f 100644
--- a/src/3rdparty/libpng/pngconf.h
+++ b/src/3rdparty/libpng/pngconf.h
@@ -64,6 +64,7 @@
# endif
#endif
+namespace PrivatePng {
/* COMPILER SPECIFIC OPTIONS.
*
* These options are provided so that a variety of difficult compilers
@@ -286,6 +287,11 @@
# endif
# endif
+/* Avoid exporting libpng symbols from Qt DLL on Windows */
+# if defined (_MSC_VER) && defined(PNG_IMPEXP)
+# undef PNG_IMPEXP
+# endif
+
# ifndef PNG_IMPEXP
# define PNG_IMPEXP
# endif
@@ -622,5 +628,5 @@ typedef char FAR * FAR * FAR * png_charppp;
# endif
# endif
#endif
-
+} // namespace PrivatePng
#endif /* PNGCONF_H */