From d057301b1f28736f094affa17b190244ad56e8d9 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 28 Oct 2017 21:11:06 +0200 Subject: patch 8.0.1236: Mac features are confusing Problem: Mac features are confusing. Solution: Make feature names more consistent, add "osxdarwin". Rename feature flags, cleanup Mac code. (Kazunobu Kuriyama, closes #2178) --- src/macros.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'src/macros.h') diff --git a/src/macros.h b/src/macros.h index c320a3f7d3..1b54b91bae 100644 --- a/src/macros.h +++ b/src/macros.h @@ -209,18 +209,13 @@ # define mch_lstat(n, p) mch_stat((n), (p)) #endif -#ifdef MACOS_CLASSIC -/* MacOS classic doesn't support perm but MacOS X does. */ -# define mch_open(n, m, p) open((n), (m)) -#else -# ifdef VMS +#ifdef VMS /* * It is possible to force some record format with: * # define mch_open(n, m, p) open(vms_fixfilename(n), (m), (p)), "rat=cr", "rfm=stmlf", "mrs=0") * but it is not recommended, because it can destroy indexes etc. */ -# define mch_open(n, m, p) open(vms_fixfilename(n), (m), (p)) -# endif +# define mch_open(n, m, p) open(vms_fixfilename(n), (m), (p)) #endif /* mch_open_rw(): invoke mch_open() with third argument for user R/W. */ @@ -266,7 +261,7 @@ * PTR2CHAR(): get character from pointer. */ #ifdef FEAT_MBYTE -/* Get the length of the character p points to */ +/* Get the length of the character p points to, including composing chars */ # define MB_PTR2LEN(p) (has_mbyte ? (*mb_ptr2len)(p) : 1) /* Advance multi-byte pointer, skip over composing chars. */ # define MB_PTR_ADV(p) p += has_mbyte ? (*mb_ptr2len)(p) : 1 -- cgit v1.2.3