TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Extend #ifdef guards to around StandardAlert for the messagebox, fixing a missing symbol error in SCons for Mac

Browse source
This commit is contained in:
Chris Taylor 2013-04-08 16:34:24 +08:00
parent 4d6d655072
commit 0b00caaeae
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
arch/carbon/messagebox.c
View file

@ -64,13 +64,15 @@ void display_mac_alert(char *message, int error)
}
else
{
// This #if guard removes both compiler warnings
// and complications if we didn't link the (older) Mac OS X SDK that actually supports the following.
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4)
Str255 error_text = "\pSorry, a critical error has occurred.";
Str255 text;
#if !defined(MAC_OS_X_VERSION_MAX_ALLOWED) || (MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_4) // kill warning
CopyCStringToPascal(message, text);
#endif
StandardAlert(error ? kAlertStopAlert : kAlertNoteAlert, error ? error_text : text, error ? text : NULL, 0, &itemHit);
#endif
}
if ((wind = window_get_front()))