diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-25 06:57:34 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2012-07-25 06:57:34 +0000 |
commit | cbb6b46f90e2d4851501bfcaabc33a74dffa6cf3 (patch) | |
tree | 95b51d71faebe820a12b1ac68f5b742f69fbe418 /Build/source/texk/kpathsea | |
parent | d5825529281ac5f76498d6cdf10d538a8fd6136a (diff) |
kpathsea: Use __CYGWIN__ in getopt.c
__CYGWIN32__ which is deprecated and may be removed (from Ken Brown)
git-svn-id: svn://tug.org/texlive/trunk@27151 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/kpathsea')
-rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 6 | ||||
-rw-r--r-- | Build/source/texk/kpathsea/getopt.c | 4 |
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 |