diff options
| author | Rémi Verschelde | 2017-09-19 14:58:19 +0200 |
|---|---|---|
| committer | GitHub | 2017-09-19 14:58:19 +0200 |
| commit | ba4439c4914582f10b06168a50244d82efe84b20 (patch) | |
| tree | 5d486716f73cf24ebf6f56581808deb3fa7025da /modules/gdnative | |
| parent | 36e8bee7524ca71609e14b71c7bf427eb832179a (diff) | |
| parent | 28dc30cd594efbea667fd9a5e507f3ecf8d25450 (diff) | |
| download | godot-ba4439c4914582f10b06168a50244d82efe84b20.tar.gz godot-ba4439c4914582f10b06168a50244d82efe84b20.tar.zst godot-ba4439c4914582f10b06168a50244d82efe84b20.zip | |
Merge pull request #11386 from kosz78/fix-msvc-compile-errors
Fix MSVC compilation errors
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/gdnative.cpp | 4 | ||||
| -rw-r--r-- | modules/gdnative/include/gdnative/gdnative.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdnative/gdnative.cpp b/modules/gdnative/gdnative.cpp index 8cc8b0bec..93a9bac11 100644 --- a/modules/gdnative/gdnative.cpp +++ b/modules/gdnative/gdnative.cpp @@ -40,8 +40,8 @@ const String init_symbol = "godot_gdnative_init"; const String terminate_symbol = "godot_gdnative_terminate"; -#define GDAPI_FUNC(name, ret_type, ...) .name = name, -#define GDAPI_FUNC_VOID(name, ...) .name = name, +#define GDAPI_FUNC(name, ret_type, ...) name, +#define GDAPI_FUNC_VOID(name, ...) name, const godot_gdnative_api_struct api_struct = { GODOT_GDNATIVE_API_FUNCTIONS diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index 04dca6f56..1c5e91d73 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -237,12 +237,12 @@ godot_variant GDAPI godot_method_bind_call(godot_method_bind *p_method_bind, god struct godot_gdnative_api_struct; // Forward declaration typedef struct { - const struct godot_gdnative_api_struct *api_struct; godot_bool in_editor; uint64_t core_api_hash; uint64_t editor_api_hash; uint64_t no_api_hash; godot_object *gd_native_library; // pointer to GDNativeLibrary that is being initialized + const struct godot_gdnative_api_struct *api_struct; } godot_gdnative_init_options; typedef struct { |