diff options
author | bjarni <bjarni@openttd.org> | 2007-02-05 21:16:56 +0000 |
---|---|---|
committer | bjarni <bjarni@openttd.org> | 2007-02-05 21:16:56 +0000 |
commit | ca1a88f6c4595c2a8250f13a2a3e218558306693 (patch) | |
tree | f736d2ea9376a1705983b456c6a998c6e7bf901c /src/gfx.h | |
parent | 1bf688e5b5a4d9cb509d06d0d2946cdca819f294 (diff) | |
download | openttd-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/gfx.h')
-rw-r--r-- | src/gfx.h | 13 |
1 files changed, 1 insertions, 12 deletions
@@ -3,11 +3,6 @@ #ifndef GFX_H #define GFX_H -/* !!! Note that the first part of this file if enclosed in extern "C" due to cocoa/obj-C !!! */ - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ enum WindowKeyCodes { WKC_SHIFT = 0x8000, @@ -175,10 +170,6 @@ void HandleExitGameRequest(void); void GameSizeChanged(void); void UndrawMouseCursor(void); -#ifdef __cplusplus -}; //extern "C" -/* Following part is only for C++ */ - #include "helpers.hpp" typedef enum FontSizes { @@ -245,7 +236,7 @@ void ScreenSizeChanged(void); void UndrawMouseCursor(void); bool ChangeResInGame(int w, int h); void SortResolutions(int count); -extern "C" void ToggleFullScreen(bool fs); +void ToggleFullScreen(bool fs); /* gfx.c */ #define ASCII_LETTERSTART 32 @@ -301,6 +292,4 @@ typedef enum StringColorFlags { extern bool _dbg_screen_rect; #endif -#endif /* __cplusplus */ - #endif /* GFX_H */ |