Merge branch 'sunweaver-pr/define-default-source-not-bsd+svid-source' into 3.6.x

Attributes GH PR #150: https://github.com/ArcticaProject/nx-libs/pull/150 Reviewed by: Vadim Troshchinskiy <vadim@qindel.com> -- Fri, 01 Jul 2016 04:33:22 -0700

Merge branch 'sunweaver-pr/define-default-source-not-bsd+svid-source' into 3.6.x
8307d4f3 · Mike Gabriel · 4b3081c4 · da4410cc · 8307d4f3 · 8307d4f3
Unverified Commit 8307d4f3 authored Jul 01, 2016 by Mike Gabriel
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

cross.def nx-X11/config/cf/cross.def +1 -1

linux.cf nx-X11/config/cf/linux.cf +1 -1

No files found.
--- a/nx-X11/config/cf/cross.def
+++ b/nx-X11/config/cf/cross.def
@@ -14,7 +14,7 @@
 #define ServerCDebugFlags	-O2
 #undef StandardDefines
 #define StandardDefines 	-Dlinux -D__arm__ -D_POSIX_SOURCE \
-				-D_BSD_SOURCE -D_GNU_SOURCE -DX_LOCALE
+				-D_DEFAULT_SOURCE -D_GNU_SOURCE -DX_LOCALE
 #undef CcCmd
 #define StdIncDir /opt/Embedix/tools/arm-linux/include
 #define PreIncDir 

--- a/nx-X11/config/cf/linux.cf
+++ b/nx-X11/config/cf/linux.cf
@@ -199,7 +199,7 @@ XCOMM binutils:	(LinuxBinUtilsMajorVersion)
 #if LinuxCLibMajorVersion >= 6
 # define LinuxSourceDefines	-D_POSIX_C_SOURCE=199309L \
 				-D_POSIX_SOURCE -D_XOPEN_SOURCE \
-				-D_BSD_SOURCE -D_SVID_SOURCE \
+				-D_DEFAULT_SOURCE \
                                -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
 				LinuxAdditionalIncludes LinuxGnuSourceDefines \
 				LinuxLocaleDefines