summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/kpathsea/ChangeLog6
-rw-r--r--Build/source/texk/kpathsea/getopt.c4
2 files changed, 7 insertions, 3 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog
index 8ed88364759..c12d88e92ab 100644
--- a/Build/source/texk/kpathsea/ChangeLog
+++ b/Build/source/texk/kpathsea/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-25 Peter Breitenlohner <peb@mppmu.mpg.de>
+
+ * getopt.c [WIN32 && ! __CYGWIN__]: Use __CYGWIN__ instead of
+ __CYGWIN32__ which is deprecated and may be removed.
+ Mail from Ken Brown <kbrow1i@gmail.com>, Tue, 24 Jul 2012.
+
2012-07-23 Peter Breitenlohner <peb@mppmu.mpg.de>
* mingw32.h (win32_popen): Static inline wrapper for _popen()
diff --git a/Build/source/texk/kpathsea/getopt.c b/Build/source/texk/kpathsea/getopt.c
index d1fc9864de5..04c1e21cb26 100644
--- a/Build/source/texk/kpathsea/getopt.c
+++ b/Build/source/texk/kpathsea/getopt.c
@@ -73,13 +73,11 @@
#endif
#endif
-#if defined (WIN32) && !defined (__CYGWIN32__)
+#if defined (WIN32) && !defined (__CYGWIN__)
/* It's not Unix, really. See? Capital letters. */
#include <stdlib.h>
#include <windows.h>
-#ifdef getpid
#undef getpid
-#endif
#define getpid() GetCurrentProcessId()
#endif