From 6f707bde95dab6998ac204f9ee6c925ee230c740 Mon Sep 17 00:00:00 2001
From: Moonchild <moonchild@palemoon.org>
Date: Thu, 6 May 2021 09:24:03 +0000
Subject: Issue #1751 -- Remove XP_MACOSX conditionals from the rest of the
 tree.

This also removes some PP abuse and takes file entries out of PP when no longer
needed without XP_MACOSX conditionals.
---
 db/mork/src/morkConfig.h | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

(limited to 'db')

diff --git a/db/mork/src/morkConfig.h b/db/mork/src/morkConfig.h
index 370cf17139..dbd4ebdf5b 100644
--- a/db/mork/src/morkConfig.h
+++ b/db/mork/src/morkConfig.h
@@ -18,10 +18,6 @@
 
 // { %%%%% begin platform defs peculiar to Mork %%%%%
 
-#ifdef XP_MACOSX
-#define MORK_MAC 1
-#endif
-
 #ifdef XP_WIN
 #define MORK_WIN 1
 #endif
@@ -32,7 +28,7 @@
 
 // } %%%%% end platform defs peculiar to Mork %%%%%
 
-#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC)
+#if defined(MORK_WIN) || defined(MORK_UNIX)
 #include <stdio.h> 
 #include <ctype.h> 
 #include <errno.h> 
@@ -88,20 +84,15 @@ void mork_fileflush(FILE * file);
 #define mork_kTAB '\011'
 #define mork_kCRLF "\015\012"     /* A CR LF equivalent string */
 
-#if defined(MORK_MAC)
-#  define mork_kNewline             "\015"
-#  define mork_kNewlineSize 1
+#if defined(MORK_WIN)
+#  define mork_kNewline           "\015\012"
+#  define mork_kNewlineSize       2
 #else
-#  if defined(MORK_WIN)
-#    define mork_kNewline           "\015\012"
-#    define mork_kNewlineSize       2
-#  else
-#    if defined(MORK_UNIX)
-#      define mork_kNewline         "\012"
-#      define mork_kNewlineSize     1
-#    endif /* MORK_UNIX */
-#  endif /* MORK_WIN */
-#endif /* MORK_MAC */
+#  if defined(MORK_UNIX)
+#    define mork_kNewline         "\012"
+#    define mork_kNewlineSize     1
+#  endif /* MORK_UNIX */
+#endif /* MORK_WIN */
 
 // { %%%%% begin assertion macro %%%%%
 extern void mork_assertion_signal(const char* inMessage);
@@ -114,7 +105,7 @@ extern void mork_assertion_signal(const char* inMessage);
 
 // { %%%%% begin standard c utility methods %%%%%
 
-#if defined(MORK_WIN) || defined(MORK_UNIX) || defined(MORK_MAC)
+#if defined(MORK_WIN) || defined(MORK_UNIX)
 #define MORK_USE_C_STDLIB 1
 #endif /*MORK_WIN*/
 
-- 
cgit v1.2.3