summaryrefslogtreecommitdiff
path: root/src/os
diff options
context:
space:
mode:
Diffstat (limited to 'src/os')
-rw-r--r--src/os/macosx/macos.h12
-rw-r--r--src/os/macosx/macos.mm (renamed from src/os/macosx/macos.m)0
2 files changed, 3 insertions, 9 deletions
diff --git a/src/os/macosx/macos.h b/src/os/macosx/macos.h
index ba33ce602..b8a6cd511 100644
--- a/src/os/macosx/macos.h
+++ b/src/os/macosx/macos.h
@@ -11,15 +11,9 @@
* the function then adds text that tells the user to update and then report the bug if it's present in the newest version
* It also quits in a nice way since we call it when we know something happened that will crash OpenTTD (like a needed pointer turns out to be NULL or similar)
*/
-#ifdef __cplusplus
-extern "C" {
-#endif //__cplusplus
- void ShowMacDialog ( const char *title, const char *message, const char *buttonLabel );
- void ShowMacAssertDialog ( const char *function, const char *file, const int line, const char *expression );
- void ShowMacErrorDialog(const char *error);
-#ifdef __cplusplus
-}
-#endif //__cplusplus
+void ShowMacDialog ( const char *title, const char *message, const char *buttonLabel );
+void ShowMacAssertDialog ( const char *function, const char *file, const int line, const char *expression );
+void ShowMacErrorDialog(const char *error);
// Since MacOS X users will never see an assert unless they started the game from a terminal
// we're using a custom assert(e) macro.
diff --git a/src/os/macosx/macos.m b/src/os/macosx/macos.mm
index 33f296325..33f296325 100644
--- a/src/os/macosx/macos.m
+++ b/src/os/macosx/macos.mm