summaryrefslogtreecommitdiff
path: root/Build/source/libs/freetype2/freetype-src
diff options
context:
space:
mode:
authorMojca Miklavec <mojca.miklavec@gmail.com>2021-09-07 19:16:50 +0000
committerMojca Miklavec <mojca.miklavec@gmail.com>2021-09-07 19:16:50 +0000
commitbfb16ac9b7e9b5e8693d4d2d2381dee00ca0c36f (patch)
treeeda41fde06263bc233bd968851963bff521fec4f /Build/source/libs/freetype2/freetype-src
parent35eb9c31f879bf66762ff312d3fb0d869cdf5c4b (diff)
simplify freetype patches for Solaris
git-svn-id: svn://tug.org/texlive/trunk@60447 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/freetype2/freetype-src')
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c6
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c6
-rw-r--r--Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c10
3 files changed, 3 insertions, 19 deletions
diff --git a/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c b/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
index 2f343778370..0e6bc74b6cc 100644
--- a/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
+++ b/Build/source/libs/freetype2/freetype-src/src/dlg/dlg.c
@@ -2,13 +2,7 @@
// Distributed under the Boost Software License, Version 1.0.
// See accompanying file LICENSE or copy at http://www.boost.org/LICENSE_1_0.txt
-/* Try Nelson's flag */
-#if defined(__sun)
#define _XOPEN_SOURCE 600
-#define _XPG6
-#else
-#define _XOPEN_SOURCE
-#endif
#define _POSIX_C_SOURCE 200809L
#define _WIN32_WINNT 0x0600
diff --git a/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c b/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
index eb0cbcea31c..5b2006c1260 100644
--- a/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
+++ b/Build/source/libs/freetype2/freetype-src/src/dlg/dlgwrap.c
@@ -18,13 +18,7 @@
/* We have to duplicate these feature test macros from `dlg.c` */
/* since `freetype.h` loads some affected standard headers. */
-/* Try Nelson's flag */
-#if defined(__sun)
#define _XOPEN_SOURCE 600
-#define _XPG6
-#else
-#define _XOPEN_SOURCE
-#endif
#define _POSIX_C_SOURCE 200809L
#include <freetype/freetype.h>
diff --git a/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c b/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c
index ff36d9daaa8..4f912cd21d6 100644
--- a/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c
+++ b/Build/source/libs/freetype2/freetype-src/src/tools/ftrandom/ftrandom.c
@@ -28,13 +28,9 @@
/* modified by Werner Lemberg <wl@gnu.org> */
/* This file is now part of the FreeType library */
-/* Try Nelson's flag in Solaris */
-#if defined(__sun)
-#define _XOPEN_SOURCE 600
-#define _XPG6
-#else
-#define _XOPEN_SOURCE 500 /* for `kill', `strdup', `random', and `srandom' */
-#endif
+
+#define _XOPEN_SOURCE 600 /* for `kill', `strdup', `random', and `srandom' */
+
#include <stdio.h>
#include <stdlib.h>