Skip to content

Commit

Permalink
setup: do not require __MRC__ defined for Mac OS 9 builds
Browse files Browse the repository at this point in the history
Partially reverts "somewhat protect Mac OS X users from using Mac OS 9
config file", commit 62519bf.

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
  • Loading branch information
ryandesign authored and bagder committed Dec 6, 2022
1 parent d502270 commit 82b3481
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion lib/curl_setup.h
Expand Up @@ -92,7 +92,7 @@
# endif
#endif

#if defined(macintosh) && defined(__MRC__)
#ifdef macintosh
# include "config-mac.h"
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/tool_setup.h
Expand Up @@ -47,7 +47,7 @@
* Platform specific stuff.
*/

#if defined(macintosh) && defined(__MRC__)
#ifdef macintosh
# define main(x,y) curl_main(x,y)
#endif

Expand Down

0 comments on commit 82b3481

Please sign in to comment.