Replaced _BSD_SOURCE, _SVID_SOURCE, _GNU_SOURCE with _DEFAULT_SOURCE.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

mkspecs/cygwin-g++/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/hurd-g++/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 

mkspecs/linux-clang/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-cxx/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-ecc-64/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-g++-32/qplatformdefs.h

@@ -1,26 +1,5 @@
-#ifndef QPLATFORMDEFS_H
+#ifndef _DEFAULT_SOURCE
-#define QPLATFORMDEFS_H
+#  define _DEFAULT_SOURCE
-
-// Get Qt defines/settings
-
-#include "qglobal.h"
-
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
-
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-g++-64/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-g++-sparc/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-g++/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-icc/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-kcc/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-kylix/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

mkspecs/linux-pgcc/qplatformdefs.h

@@ -5,22 +5,8 @@
 
 #include "qglobal.h"
 
-// Set any POSIX/XOPEN defines at the top of this file to turn on specific APIs
+#ifndef _DEFAULT_SOURCE
-
+#  define _DEFAULT_SOURCE
-// DNS system header files are a mess!
-// <resolv.h> includes <arpa/nameser.h>. <arpa/nameser.h> is using
-// 'u_char' and includes <sys/types.h>.  Now the problem is that
-// <sys/types.h> defines 'u_char' only if __USE_BSD is defined.
-// __USE_BSD is defined in <features.h> if _BSD_SOURCE is defined.
-#ifndef _BSD_SOURCE
-#  define _BSD_SOURCE
-#endif
-
-// 1) need to reset default environment if _BSD_SOURCE is defined
-// 2) need to specify POSIX thread interfaces explicitly in glibc 2.0
-// 3) it seems older glibc need this to include the X/Open stuff
-#ifndef _GNU_SOURCE
-#  define _GNU_SOURCE
 #endif
 
 #include <unistd.h>

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

src/moc/moc_yacc.cpp

@@ -2112,7 +2112,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