summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorLuigi Scarso <luigi.scarso@gmail.com>2018-03-26 09:45:17 +0000
committerLuigi Scarso <luigi.scarso@gmail.com>2018-03-26 09:45:17 +0000
commitd8bdf6459e82436b78883e82d4cc5f61a14fc53e (patch)
tree0c36f8c635898f9420b7c7883c57af18c584f406 /Build
parent938ffdb31be72faf77479ca4d5ca4ef9fe383d3c (diff)
better patch for __NetBSD__ (thanks to Marc Baudoin)
git-svn-id: svn://tug.org/texlive/trunk@47129 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/libs/poppler/TLpatches/patch-03-time13
-rw-r--r--Build/source/libs/poppler/poppler-src/goo/gfile.h5
2 files changed, 10 insertions, 8 deletions
diff --git a/Build/source/libs/poppler/TLpatches/patch-03-time b/Build/source/libs/poppler/TLpatches/patch-03-time
index 2246093f695..1b9339d1a3d 100644
--- a/Build/source/libs/poppler/TLpatches/patch-03-time
+++ b/Build/source/libs/poppler/TLpatches/patch-03-time
@@ -1,12 +1,13 @@
$ diff -u gfile.h.orig gfile.h
---- gfile.h.orig 2018-03-22 15:08:01.913911597 +0100
-+++ gfile.h 2018-03-22 15:00:59.106829862 +0100
-@@ -51,6 +51,8 @@
- #elif defined(ACORN)
+--- gfile.h.orig 2018-03-26 11:43:40.479917632 +0200
++++ gfile.h 2018-03-26 11:41:51.965590455 +0200
+@@ -52,6 +52,9 @@
#elif defined(MACOS)
# include <ctime.h>
-+#elif defined(__NetBSD__)
-+#include <time.h>
#else
++# if defined(__NetBSD__)
++# include <time.h>
++# endif
# include <unistd.h>
# include <sys/types.h>
+ # if defined(VMS)
diff --git a/Build/source/libs/poppler/poppler-src/goo/gfile.h b/Build/source/libs/poppler/poppler-src/goo/gfile.h
index b3117236eb7..e02de720808 100644
--- a/Build/source/libs/poppler/poppler-src/goo/gfile.h
+++ b/Build/source/libs/poppler/poppler-src/goo/gfile.h
@@ -51,9 +51,10 @@ extern "C" {
#elif defined(ACORN)
#elif defined(MACOS)
# include <ctime.h>
-#elif defined(__NetBSD__)
-#include <time.h>
#else
+# if defined(__NetBSD__)
+# include <time.h>
+# endif
# include <unistd.h>
# include <sys/types.h>
# if defined(VMS)