diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/libpng/pngconf.h | 22 | ||||
| -rw-r--r-- | src/moc/moc_yacc.cpp | 2 |
2 files changed, 1 insertions, 23 deletions
diff --git a/src/3rdparty/libpng/pngconf.h b/src/3rdparty/libpng/pngconf.h index bd5d1c430..19ccaf1e0 100644 --- a/src/3rdparty/libpng/pngconf.h +++ b/src/3rdparty/libpng/pngconf.h @@ -246,30 +246,8 @@ #endif #ifdef PNG_SETJMP_SUPPORTED -/* This is an attempt to force a single setjmp behaviour on Linux. If - * the X config stuff didn't define _BSD_SOURCE we wouldn't need this. - */ - -# ifdef __linux__ -# ifdef _BSD_SOURCE -# define PNG_SAVE_BSD_SOURCE -# undef _BSD_SOURCE -# endif -# ifdef _SETJMP_H - __png.h__ already includes setjmp.h; - __dont__ include it again.; -# endif -# endif /* __linux__ */ - /* include setjmp.h for error handling */ # include <setjmp.h> - -# ifdef __linux__ -# ifdef PNG_SAVE_BSD_SOURCE -# define _BSD_SOURCE -# undef PNG_SAVE_BSD_SOURCE -# endif -# endif /* __linux__ */ #endif /* PNG_SETJMP_SUPPORTED */ #ifdef BSD diff --git a/src/moc/moc_yacc.cpp b/src/moc/moc_yacc.cpp index 8ae53116a..d384e0baa 100644 --- a/src/moc/moc_yacc.cpp +++ b/src/moc/moc_yacc.cpp @@ -2117,7 +2117,7 @@ yystrlen (yystr) # endif # ifndef yystpcpy -# if defined __GLIBC__ && defined _STRING_H && defined _GNU_SOURCE +# if defined __GLIBC__ && defined _STRING_H && defined _DEFAULT_SOURCE # define yystpcpy stpcpy # else /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in |