From: Ryan Schmidt <git@ryandesign.com>
Date: Sat, 27 Aug 2022 00:31:31 +0000 (-0500)
Subject: setup: do not require __MRC__ defined for Mac OS 9 builds
X-Git-Tag: curl-7_87_0~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82b34813097d86dd429f33ffe1ab047d4b06897e;p=thirdparty%2Fcurl.git

setup: do not require __MRC__ defined for Mac OS 9 builds

Partially reverts "somewhat protect Mac OS X users from using Mac OS 9
config file", commit 62519bfe059251af2914199f284c736553ff0489.

Do things that are specific to classic Mac OS (i.e. include config-mac.h
in curl_setup.h and rename "main" to "curl_main" in tool_setup.h) when
only "macintosh" is defined. Remove the additional condition that
"__MRC__" should be defined since that would only be true with the MPW
MrC compiler which prevents the use of other reasonable compilers like
the MPW SC compiler and especially the Metrowerks CodeWarrior compilers.
"macintosh" is only defined by classic Mac OS compilers so this change
should not affect users of Mac OS X / OS X / macOS / any other OS.

Closes #10037
---

diff --git a/lib/curl_setup.h b/lib/curl_setup.h
index 6612eb4b6b..2b85a60e4c 100644
--- a/lib/curl_setup.h
+++ b/lib/curl_setup.h
@@ -92,7 +92,7 @@
 #  endif
 #endif
 
-#if defined(macintosh) && defined(__MRC__)
+#ifdef macintosh
 #  include "config-mac.h"
 #endif
 
diff --git a/src/tool_setup.h b/src/tool_setup.h
index 16fa00e7d1..2543190672 100644
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -47,7 +47,7 @@
  * Platform specific stuff.
  */
 
-#if defined(macintosh) && defined(__MRC__)
+#ifdef macintosh
 #  define main(x,y) curl_main(x,y)
 #endif