diff options
| author | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-11 20:31:24 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-11 20:31:27 +0200 |
| commit | 0db0ac4a255931036c5859c3f22108f4e27ccd11 (patch) | |
| tree | d29e8f47358e1443e147b8604ce3e756cd3b40cd /utils | |
| parent | a4318c668fa49ff3423feed184c0ce58227359b8 (diff) | |
| download | haskell-0db0ac4a255931036c5859c3f22108f4e27ccd11.tar.gz | |
Removes all occurrences of __MINGW32__ (#10485)
In Haskell files, replace `__MINGW32__` by `mingw32_HOST_OS`.
In .c and .h files, delete `__MINGW32__` when `_WIN32` is also tested
because `_WIN32` is always defined when `__MINGW32__` is. Also replace
`__MINGW32__` by `_WIN32` when used standalone for consistency.
Differential Revision: https://phabricator.haskell.org/D971
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/hp2ps/Main.c | 2 | ||||
| -rw-r--r-- | utils/touchy/touchy.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/utils/hp2ps/Main.c b/utils/hp2ps/Main.c index 1c21d2b2cb..709bb1357d 100644 --- a/utils/hp2ps/Main.c +++ b/utils/hp2ps/Main.c @@ -143,7 +143,7 @@ nextarg: ; if (!filter) { pathName = copystring(argv[0]); DropSuffix(pathName, ".hp"); -#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32) +#if defined(_MSC_VER) || defined(_WIN32) DropSuffix(pathName, ".exe"); #endif baseName = copystring(Basename(pathName)); diff --git a/utils/touchy/touchy.c b/utils/touchy/touchy.c index 7252012366..a8ac14658d 100644 --- a/utils/touchy/touchy.c +++ b/utils/touchy/touchy.c @@ -2,7 +2,7 @@ * Simple 'touch' program for Windows * */ -#if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_WIN32) +#if !defined(_MSC_VER) && !defined(_WIN32) #error "Win32-only, the platform you're using is supposed to have 'touch' already." #else #include <stdio.h> |