summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorhjk <qtc-committer@nokia.com>2011-11-22 13:49:57 (GMT)
committerhjk <qthjk@ovi.com>2011-11-22 13:51:15 (GMT)
commit91bf025444f13eb269ece6bb430a841638bb32a8 (patch)
treebc55e4877fbab40f5bd044036d1a56bcea7d6b66 /src/3rdparty
parent608c4766a8d1a30c773c8b0f0701c8e746215c80 (diff)
downloadQt-91bf025444f13eb269ece6bb430a841638bb32a8.zip
Qt-91bf025444f13eb269ece6bb430a841638bb32a8.tar.gz
Qt-91bf025444f13eb269ece6bb430a841638bb32a8.tar.bz2
Add spaces for string concatenation to work around C++11 source incompatibility.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Task-number: QTBUG-22847
Diffstat (limited to 'src/3rdparty')
-rw-r--r--src/3rdparty/libpng/pngdebug.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/3rdparty/libpng/pngdebug.h b/src/3rdparty/libpng/pngdebug.h
index 16f81fd..4547b7d 100644
--- a/src/3rdparty/libpng/pngdebug.h
+++ b/src/3rdparty/libpng/pngdebug.h
@@ -85,7 +85,7 @@
# define png_debug(l,m) \
do { \
int num_tabs=l; \
- fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+ fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":"")))); \
} while (0)
# endif
@@ -93,7 +93,7 @@
# define png_debug1(l,m,p1) \
do { \
int num_tabs=l; \
- fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+ fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1); \
} while (0)
# endif
@@ -101,7 +101,7 @@
# define png_debug2(l,m,p1,p2) \
do { \
int num_tabs=l; \
- fprintf(PNG_DEBUG_FILE,"%s"m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
+ fprintf(PNG_DEBUG_FILE,"%s" m PNG_STRING_NEWLINE,(num_tabs==1 ? "\t" : \
(num_tabs==2 ? "\t\t":(num_tabs>2 ? "\t\t\t":""))),p1,p2); \
} while (0)
# endif