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)
diff --git a/src/message.c b/src/message.c
index 41ab17a..221e3d8 100644
--- a/src/message.c
+++ b/src/message.c
@@ -2660,11 +2660,10 @@
if (!(silent_mode && p_verbose == 0))
{
/* NL --> CR NL translation (for Unix, not for "--version") */
- /* NL --> CR translation (for Mac) */
p = &buf[0];
if (*s == '\n' && !info_message)
*p++ = '\r';
-#if defined(USE_CR) && !defined(MACOS_X_UNIX)
+#if defined(USE_CR)
else
#endif
*p++ = *s;
@@ -3005,7 +3004,7 @@
* On Mac, when started from Finder, stderr is the console. */
if (
# ifdef UNIX
-# ifdef MACOS_X_UNIX
+# ifdef MACOS_X
(isatty(2) && strcmp("/dev/console", ttyname(2)) != 0)
# else
isatty(2)
@@ -3072,7 +3071,7 @@
* On Mac, when started from Finder, stderr is the console. */
if (
# ifdef UNIX
-# ifdef MACOS_X_UNIX
+# ifdef MACOS_X
(isatty(2) && strcmp("/dev/console", ttyname(2)) != 0)
# else
isatty(2)