romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 12:23:44 +03:00
Code Issues Projects Releases Packages Wiki Activity

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

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

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
This commit is contained in:
Ryan Schmidt 2022-08-26 19:31:31 -05:00 • committed by Daniel Stenberg
parent d502270eb2
commit 82b3481309
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/curl_setup.h
View file

@ -92,7 +92,7 @@
# endif
#endif
#if defined(macintosh) && defined(__MRC__)
#ifdef macintosh
# include "config-mac.h"
#endif

2
src/tool_setup.h
View file

@ -47,7 +47,7 @@
* Platform specific stuff.
*/
#if defined(macintosh) && defined(__MRC__)
#ifdef macintosh
# define main(x,y) curl_main(x,y)
#endif