X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bedaf53eaf4e2a860b34d4ff5e0b1928ce8fa5c9..7946d7deaac081a745dc616a5eb13ae864865fa2:/src/mac/carbon/utils.cpp diff --git a/src/mac/carbon/utils.cpp b/src/mac/carbon/utils.cpp index 9389888343..6016d24d81 100644 --- a/src/mac/carbon/utils.cpp +++ b/src/mac/carbon/utils.cpp @@ -27,7 +27,7 @@ #include #include -#ifndef __UNIX__ +#ifndef __DARWIN__ // defined in unix/utilsunx.cpp for Mac OS X // get full hostname (with domain name if possible) @@ -104,7 +104,7 @@ bool wxGetUserName(char *buf, int maxSize) return TRUE; } -int wxKill(long pid, int sig) +int wxKill(long pid, wxSignal sig) { // TODO return 0; @@ -178,7 +178,7 @@ void wxFatalError(const wxString& msg, const wxString& title) wxMessageBox(wxBuffer); wxExit(); } -#endif // !__UNIX__ +#endif // !__DARWIN__ // Emit a beeeeeep void wxBell() @@ -315,7 +315,7 @@ bool wxIsBusy() return (wxBusyCursorCount > 0); } -#ifndef __UNIX__ +#ifndef __DARWIN__ wxString wxMacFindFolder( short vol, OSType folderType, Boolean createFolder) @@ -336,7 +336,7 @@ wxString wxMacFindFolder( short vol, } #endif -#ifndef __UNIX__ +#ifndef __DARWIN__ char *wxGetUserHome (const wxString& user) { // TODO