godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #11386 from kosz78/fix-msvc-compile-errors 

Fix MSVC compilation errors
This commit is contained in:
Rémi Verschelde 2017-09-19 14:58:19 +02:00 committed by GitHub
parent 36e8bee752 28dc30cd59
commit ba4439c491
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/os/file_access.h
View File

@ -140,7 +140,7 @@ public:
virtual Error reopen(const String &p_path, int p_mode_flags); ///< does not change the AccessType virtual Error reopen(const String &p_path, int p_mode_flags); ///< does not change the AccessType
virtual Error _chmod(const String &p_path, int p_mod) {} virtual Error _chmod(const String &p_path, int p_mod) { return FAILED; }
static FileAccess *create(AccessType p_access); /// Create a file access (for the current platform) this is the only portable way of accessing files. static FileAccess *create(AccessType p_access); /// Create a file access (for the current platform) this is the only portable way of accessing files.
static FileAccess *create_for_path(const String &p_path); static FileAccess *create_for_path(const String &p_path);

4
modules/gdnative/gdnative.cpp
View File

@ -40,8 +40,8 @@
const String init_symbol = "godot_gdnative_init"; const String init_symbol = "godot_gdnative_init";
const String terminate_symbol = "godot_gdnative_terminate"; const String terminate_symbol = "godot_gdnative_terminate";
#define GDAPI_FUNC(name, ret_type, ...) .name = name, #define GDAPI_FUNC(name, ret_type, ...) name,
#define GDAPI_FUNC_VOID(name, ...) .name = name, #define GDAPI_FUNC_VOID(name, ...) name,
const godot_gdnative_api_struct api_struct = { const godot_gdnative_api_struct api_struct = {
GODOT_GDNATIVE_API_FUNCTIONS GODOT_GDNATIVE_API_FUNCTIONS

2
modules/gdnative/include/gdnative/gdnative.h
View File

@ -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 struct godot_gdnative_api_struct; // Forward declaration
typedef struct { typedef struct {
const struct godot_gdnative_api_struct *api_struct;
godot_bool in_editor; godot_bool in_editor;
uint64_t core_api_hash; uint64_t core_api_hash;
uint64_t editor_api_hash; uint64_t editor_api_hash;
uint64_t no_api_hash; uint64_t no_api_hash;
godot_object *gd_native_library; // pointer to GDNativeLibrary that is being initialized godot_object *gd_native_library; // pointer to GDNativeLibrary that is being initialized
const struct godot_gdnative_api_struct *api_struct;
} godot_gdnative_init_options; } godot_gdnative_init_options;
typedef struct { typedef struct {