From ce53138ff0d156e9f229d0adab745d2d4cfaf582 Mon Sep 17 00:00:00 2001 From: Bernard Desmyter Date: Fri, 12 Jun 2015 11:01:45 +0200 Subject: 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 --- utils/hp2ps/Main.c | 2 +- utils/touchy/touchy.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'utils') 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 -- cgit v1.2.1