diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-02-17 17:44:42 +0100 |
commit | 4f97475d326c2773a78561fb874e4f23c25cbcd9 (patch) | |
tree | 7e066bc70556dfbb415ddb9f364e8432e8aaf189 /src/macros.h | |
parent | 78d21dae9c3a39efb30316d3e38dce120bc1abbd (diff) |
patch 8.1.0941: macros for MS-Windows are inconsistentv8.1.0941
Problem: Macros for MS-Windows are inconsistent, using "32", "3264 and
others.
Solution: Use MSWIN for all MS-Windows builds. Use FEAT_GUI_MSWIN for the
GUI build. (Hirohito Higashi, closes #3932)
Diffstat (limited to 'src/macros.h')
-rw-r--r-- | src/macros.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/macros.h b/src/macros.h index 29607db179..b81af8c60e 100644 --- a/src/macros.h +++ b/src/macros.h @@ -160,11 +160,11 @@ # define mch_stat(n, p) stat(vms_fixfilename(n), (p)) # define mch_rmdir(n) rmdir(vms_fixfilename(n)) #else -# ifndef WIN32 +# ifndef MSWIN # define mch_access(n, p) access((n), (p)) # endif # define mch_fstat(n, p) fstat((n), (p)) -# ifdef MSWIN /* has its own mch_stat() function */ +# ifdef MSWIN // has its own mch_stat() function # define mch_stat(n, p) vim_stat((n), (p)) # else # ifdef STAT_IGNORES_SLASH @@ -194,7 +194,7 @@ #if defined(UNIX) || defined(VMS) /* open in rw------- mode */ # define mch_open_rw(n, f) mch_open((n), (f), (mode_t)0600) #else -# if defined(MSWIN) /* open read/write */ +# if defined(MSWIN) // open read/write # define mch_open_rw(n, f) mch_open((n), (f), S_IREAD | S_IWRITE) # else # define mch_open_rw(n, f) mch_open((n), (f), 0) @@ -269,7 +269,7 @@ # include <math.h> # endif # ifdef USING_FLOAT_STUFF -# if defined(WIN32) +# ifdef MSWIN # ifndef isnan # define isnan(x) _isnan(x) static __inline int isinf(double x) { return !_finite(x) && !_isnan(x); } |