summaryrefslogtreecommitdiff
path: root/Build
diff options
context:
space:
mode:
authorPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-27 13:58:10 +0000
committerPeter Breitenlohner <peb@mppmu.mpg.de>2012-02-27 13:58:10 +0000
commitf4222b477f75ffde8177b21ee67ea76159620609 (patch)
tree77255cdfcb094ad56287abb36144356e417b563e /Build
parentc36a1ec83333067ce2b495c2fa4ae5ad61e40fdc (diff)
kpathsea: include our getopt.h, such that the one from Cygwin will be skipped
git-svn-id: svn://tug.org/texlive/trunk@25514 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
-rw-r--r--Build/source/texk/kpathsea/ChangeLog5
-rw-r--r--Build/source/texk/kpathsea/c-unistd.h5
2 files changed, 9 insertions, 1 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 8fd8e4f8e7d..aadc7b9b3fa 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-27 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * c-unistd.h [CYGWIN]: Explicitly #include <kpathsea/getopt.h>
+ such that <getopt.h> from Cygwin will be skipped.
+
2012-02-27 Ken Brown <kbrow1i@gmail.com>
* getopt.h: Cygwin requires getopt() prototype.
diff --git a/Build/source/texk/kpathsea/c-unistd.h b/Build/source/texk/kpathsea/c-unistd.h
index d033e945404..9447544bf64 100644
--- a/Build/source/texk/kpathsea/c-unistd.h
+++ b/Build/source/texk/kpathsea/c-unistd.h
@@ -1,7 +1,7 @@
/* c-unistd.h: ensure we have constants from <unistd.h>. Included from
c-std.h.
- Copyright 1992, 1993, 2008 Karl Berry.
+ Copyright 1992, 1993, 2008, 2012 Karl Berry.
Copyright 2005 Olaf Weber.
This library is free software; you can redistribute it and/or
@@ -24,6 +24,9 @@
#include <kpathsea/systypes.h>
#if HAVE_UNISTD_H
+#ifdef __CYGWIN__
+#include <kpathsea/getopt.h>
+#endif
#include <unistd.h>
#endif