diff options
| author | Bernard Desmyter <bernarddesmyter@gmail.com> | 2015-06-12 11:01:45 +0200 |
|---|---|---|
| committer | Thomas Miedema <thomasmiedema@gmail.com> | 2015-06-12 11:01:58 +0200 |
| commit | ce53138ff0d156e9f229d0adab745d2d4cfaf582 (patch) | |
| tree | 2bda5ea5eec9b74b57e8e6d33769dec12a25b4f2 | |
| parent | c60704fc405149407c155e297433f1cc299ae58a (diff) | |
| download | haskell-ce53138ff0d156e9f229d0adab745d2d4cfaf582.tar.gz | |
Delete _MSC_VER when not necessary, fix #10511
Simplify some preprocessor expressions involving `_MSC_VER` because
`_WIN32` is always defined when `_MSC_VER` is.
Differential Revision: https://phabricator.haskell.org/D981
| -rw-r--r-- | libraries/base/cbits/Win32Utils.c | 2 | ||||
| -rw-r--r-- | libraries/base/cbits/consUtils.c | 2 | ||||
| -rw-r--r-- | libraries/base/cbits/inputReady.c | 4 | ||||
| -rw-r--r-- | libraries/base/include/HsBase.h | 4 | ||||
| -rw-r--r-- | utils/hp2ps/Main.c | 2 | ||||
| -rw-r--r-- | utils/touchy/touchy.c | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/libraries/base/cbits/Win32Utils.c b/libraries/base/cbits/Win32Utils.c index 1b9292c3b4..965adc2902 100644 --- a/libraries/base/cbits/Win32Utils.c +++ b/libraries/base/cbits/Win32Utils.c @@ -4,7 +4,7 @@ Useful Win32 bits ------------------------------------------------------------------------- */ -#if defined(_MSC_VER) || defined(_WIN32) +#if defined(_WIN32) #include "HsBase.h" diff --git a/libraries/base/cbits/consUtils.c b/libraries/base/cbits/consUtils.c index c56be21632..0c9202d0c9 100644 --- a/libraries/base/cbits/consUtils.c +++ b/libraries/base/cbits/consUtils.c @@ -3,7 +3,7 @@ * * Win32 Console API support */ -#if defined(_MSC_VER) || defined(_WIN32) || defined(__CYGWIN__) +#if defined(_WIN32) || defined(__CYGWIN__) /* to the end */ #include "consUtils.h" diff --git a/libraries/base/cbits/inputReady.c b/libraries/base/cbits/inputReady.c index edb44726c5..8714eea752 100644 --- a/libraries/base/cbits/inputReady.c +++ b/libraries/base/cbits/inputReady.c @@ -17,7 +17,7 @@ int fdReady(int fd, int write, int msecs, int isSock) { if -#if defined(_MSC_VER) || defined(_WIN32) +#if defined(_WIN32) ( isSock ) { #else ( 1 ) { @@ -54,7 +54,7 @@ fdReady(int fd, int write, int msecs, int isSock) /* 1 => Input ready, 0 => not ready, -1 => error */ return (ready); } -#if defined(_MSC_VER) || defined(_WIN32) +#if defined(_WIN32) else { DWORD rc; HANDLE hFile = (HANDLE)_get_osfhandle(fd); diff --git a/libraries/base/include/HsBase.h b/libraries/base/include/HsBase.h index 7afd5a5aee..a5512cc29a 100644 --- a/libraries/base/include/HsBase.h +++ b/libraries/base/include/HsBase.h @@ -298,7 +298,7 @@ __hscore_ftruncate( int fd, off_t where ) INLINE int __hscore_setmode( int fd, HsBool toBin ) { -#if defined(_MSC_VER) || defined(_WIN32) +#if defined(_WIN32) return setmode(fd,(toBin == HS_BOOL_TRUE) ? _O_BINARY : _O_TEXT); #else return 0; @@ -383,7 +383,7 @@ __hscore_sizeof_termios( void ) } #endif -#if !defined(_MSC_VER) && !defined(_WIN32) +#if !defined(_WIN32) INLINE HsInt __hscore_sizeof_sigset_t( void ) { diff --git a/utils/hp2ps/Main.c b/utils/hp2ps/Main.c index 709bb1357d..74d1bce05b 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(_WIN32) +#if defined(_WIN32) DropSuffix(pathName, ".exe"); #endif baseName = copystring(Basename(pathName)); diff --git a/utils/touchy/touchy.c b/utils/touchy/touchy.c index a8ac14658d..88ababac01 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(_WIN32) +#if !defined(_WIN32) #error "Win32-only, the platform you're using is supposed to have 'touch' already." #else #include <stdio.h> |