mirror of
https://github.com/janet-lang/janet
synced 2025-01-22 21:26:51 +00:00
Conditional compilation on some c99 syntax in header.
If the header is in a C++11 compilation unit, use C++11 aggregate initialization syntax instead.
This commit is contained in:
parent
2d275c4782
commit
2f89bdc672
4
.gitignore
vendored
4
.gitignore
vendored
@ -61,6 +61,10 @@ tags
|
|||||||
vgcore.*
|
vgcore.*
|
||||||
*.out.*
|
*.out.*
|
||||||
|
|
||||||
|
# Wix artifacts
|
||||||
|
*.msi
|
||||||
|
*.wixpdb
|
||||||
|
|
||||||
# Created by https://www.gitignore.io/api/c
|
# Created by https://www.gitignore.io/api/c
|
||||||
|
|
||||||
### C ###
|
### C ###
|
||||||
|
@ -267,11 +267,22 @@ typedef struct {
|
|||||||
} JanetBuildConfig;
|
} JanetBuildConfig;
|
||||||
|
|
||||||
/* Get config of current compilation unit. */
|
/* Get config of current compilation unit. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
/* C++11 syntax */
|
||||||
|
#define janet_config_current() (JanetBuildConfig { \
|
||||||
|
JANET_VERSION_MAJOR, \
|
||||||
|
JANET_VERSION_MINOR, \
|
||||||
|
JANET_VERSION_PATCH, \
|
||||||
|
JANET_CURRENT_CONFIG_BITS })
|
||||||
|
#else
|
||||||
|
/* C99 syntax */
|
||||||
#define janet_config_current() ((JanetBuildConfig){ \
|
#define janet_config_current() ((JanetBuildConfig){ \
|
||||||
JANET_VERSION_MAJOR, \
|
JANET_VERSION_MAJOR, \
|
||||||
JANET_VERSION_MINOR, \
|
JANET_VERSION_MINOR, \
|
||||||
JANET_VERSION_PATCH, \
|
JANET_VERSION_PATCH, \
|
||||||
JANET_CURRENT_CONFIG_BITS })
|
JANET_CURRENT_CONFIG_BITS })
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/***** END SECTION CONFIG *****/
|
/***** END SECTION CONFIG *****/
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user