diff options
| author | Nils Thuerey <nils@thuerey.de> | 2005-11-24 15:42:33 +0300 |
|---|---|---|
| committer | Nils Thuerey <nils@thuerey.de> | 2005-11-24 15:42:33 +0300 |
| commit | 006e9547a90a9de249badda358b000e34bc612f1 (patch) | |
| tree | 1e8dde0c4cc32466cee50a6949e5a84d280a0f2a /intern | |
| parent | fde37188434ba31bf1c1e74425f602401da4a534 (diff) | |
- 'extern "C"' fix for MSVC as suggested by Stephane
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/elbeem/intern/utilities.cpp | 10 | ||||
| -rw-r--r-- | intern/elbeem/intern/utilities.h | 6 |
2 files changed, 7 insertions, 9 deletions
diff --git a/intern/elbeem/intern/utilities.cpp b/intern/elbeem/intern/utilities.cpp index 4ed848b0eff..340a306c7f1 100644 --- a/intern/elbeem/intern/utilities.cpp +++ b/intern/elbeem/intern/utilities.cpp @@ -26,13 +26,11 @@ #include "SDL.h" #include "SDL_thread.h" #include "SDL_mutex.h" -extern "C" { - void simulateThreadIncreaseFrame(void); -} -extern SDL_mutex *globalBakeLock; +extern "C" void simulateThreadIncreaseFrame(void); +extern "C" SDL_mutex *globalBakeLock; // global state variables -extern int globalBakeState; -extern int globalBakeFrame; +extern "C" int globalBakeState; +extern "C" int globalBakeFrame; #endif // ELBEEM_BLENDER==1 #include "utilities.h" diff --git a/intern/elbeem/intern/utilities.h b/intern/elbeem/intern/utilities.h index 3e39c57855a..19d93c3a91c 100644 --- a/intern/elbeem/intern/utilities.h +++ b/intern/elbeem/intern/utilities.h @@ -34,7 +34,7 @@ int getGlobalBakeState(void); #else // ELBEEM_BLENDER #define DEBUG 10 #endif // ELBEEM_BLENDER -extern int gDebugLevel; +extern "C" int gDebugLevel; // state of the simulation world // default @@ -48,9 +48,9 @@ extern int gDebugLevel; // general error #define SIMWORLD_GENERICERROR -3 // global world state -extern int gElbeemState; +extern "C" int gElbeemState; // last error as string -extern char gElbeemErrorString[]; +extern "C" char gElbeemErrorString[]; // check world status macro #define SIMWORLD_OK() (gElbeemState>=0) |