aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 13:46:26 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2016-07-01 13:46:26 +0200
commit8307d4f330cde01a1f048598be184aa4bfa54501 (patch)
treec294fac2878e77689b4c025c95d4c0cbeb293236
parent4b3081c4814891c22c6a881dde0c0b3e6ceced1d (diff)
parentda4410cce0db611abac8bc24db5672ea88f089a6 (diff)
downloadnx-libs-8307d4f330cde01a1f048598be184aa4bfa54501.tar.gz
nx-libs-8307d4f330cde01a1f048598be184aa4bfa54501.tar.bz2
nx-libs-8307d4f330cde01a1f048598be184aa4bfa54501.zip
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
-rw-r--r--nx-X11/config/cf/cross.def2
-rw-r--r--nx-X11/config/cf/linux.cf2
2 files changed, 2 insertions, 2 deletions
diff --git a/nx-X11/config/cf/cross.def b/nx-X11/config/cf/cross.def
index 9f71091f5..74ca2de96 100644
--- 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
diff --git a/nx-X11/config/cf/linux.cf b/nx-X11/config/cf/linux.cf
index 3ff1f5b7d..1caffce8a 100644
--- 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