diff options
author | Benoit Germain <benoit.germain@ubisoft.com> | 2024-03-18 09:56:44 +0100 |
---|---|---|
committer | Benoit Germain <benoit.germain@ubisoft.com> | 2024-03-19 15:57:52 +0100 |
commit | 37e9658f74f9421aaae5fe71f12eb2221f2d574a (patch) | |
tree | f55aeab48b2b4edf3267aaf1f5459d52c9b7aa36 /src/universe.h | |
parent | 352c7bec48f166e34fa94f7481882a8b5958e15c (diff) | |
download | lanes-37e9658f74f9421aaae5fe71f12eb2221f2d574a.tar.gz lanes-37e9658f74f9421aaae5fe71f12eb2221f2d574a.tar.bz2 lanes-37e9658f74f9421aaae5fe71f12eb2221f2d574a.zip |
C++ migration: buildfixes
Essentially, buildfixes when compiling as C++, plus properly marking public API as extern "C"
Diffstat (limited to '')
-rw-r--r-- | src/universe.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/universe.h b/src/universe.h index 03c78cf..0224e99 100644 --- a/src/universe.h +++ b/src/universe.h | |||
@@ -1,10 +1,13 @@ | |||
1 | /* | 1 | #pragma once |
2 | * UNIVERSE.H | ||
3 | */ | ||
4 | #ifndef UNIVERSE_H | ||
5 | #define UNIVERSE_H | ||
6 | 2 | ||
3 | #ifdef __cplusplus | ||
4 | extern "C" { | ||
5 | #endif // __cplusplus | ||
7 | #include "lua.h" | 6 | #include "lua.h" |
7 | #ifdef __cplusplus | ||
8 | } | ||
9 | #endif // __cplusplus | ||
10 | |||
8 | #include "threading.h" | 11 | #include "threading.h" |
9 | #include "macros_and_utils.h" | 12 | #include "macros_and_utils.h" |
10 | 13 | ||
@@ -101,5 +104,3 @@ typedef struct s_Universe Universe; | |||
101 | Universe* universe_get( lua_State* L); | 104 | Universe* universe_get( lua_State* L); |
102 | Universe* universe_create( lua_State* L); | 105 | Universe* universe_create( lua_State* L); |
103 | void universe_store( lua_State* L, Universe* U); | 106 | void universe_store( lua_State* L, Universe* U); |
104 | |||
105 | #endif // UNIVERSE_H | ||