summaryrefslogtreecommitdiff
path: root/src/os/macosx/macos.h
diff options
context:
space:
mode:
authorbjarni <bjarni@openttd.org>2007-02-05 21:16:56 +0000
committerbjarni <bjarni@openttd.org>2007-02-05 21:16:56 +0000
commitca1a88f6c4595c2a8250f13a2a3e218558306693 (patch)
treef736d2ea9376a1705983b456c6a998c6e7bf901c /src/os/macosx/macos.h
parent1bf688e5b5a4d9cb509d06d0d2946cdca819f294 (diff)
downloadopenttd-ca1a88f6c4595c2a8250f13a2a3e218558306693.tar.xz
(svn r8605) -Codechange: [OSX] changed all objective C to objective C++
This will permanently solve the issue where compilation on OSX broke because C++ code was added to some header files -Note: (important if you develop mac specific code) taken from http://developer.apple.com/releasenotes/Cocoa/Objective-C++.html gdb lacks an integrated C++ with Objective-C parser. This means that gdb won't be able to evaluate expressions that contain both C++ and Objective-C constructs. gdb assumes that the language for ".mm" files is C++. you can change it to objective C by typing: (gdb) set language objc Mixing C++ and objective C has some limitation (see link for all of them)
Diffstat (limited to 'src/os/macosx/macos.h')
-rw-r--r--src/os/macosx/macos.h12
1 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.