diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-10-03 15:09:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-03 15:09:00 +0200 |
| commit | f8484bb77d6ddf1f5078d804a8abff3d106d6cab (patch) | |
| tree | 6437c83af9590d09ac60eead1247d53890ed4565 /modules | |
| parent | c1cee80829f10d32cc23067291321b049af7082d (diff) | |
| parent | 60688c3fe71f322fbf30938da47e717f9c3a0fb4 (diff) | |
Merge pull request #22672 from akien-mga/fix-warnings
Fix various warnings reported by CI in #22620
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/csg/csg_gizmos.cpp | 2 | ||||
| -rw-r--r-- | modules/gdnative/include/gdnative/gdnative.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/csg/csg_gizmos.cpp b/modules/csg/csg_gizmos.cpp index 07c33ed670..5864d02615 100644 --- a/modules/csg/csg_gizmos.cpp +++ b/modules/csg/csg_gizmos.cpp @@ -215,7 +215,7 @@ void CSGShapeSpatialGizmoPlugin::commit_handle(EditorSpatialGizmo *p_gizmo, int UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo(); ur->create_action(TTR("Change Box Shape Extents")); static const char *method[3] = { "set_width", "set_height", "set_depth" }; - float current; + float current = 0; switch (p_idx) { case 0: current = s->get_width(); break; case 1: current = s->get_height(); break; diff --git a/modules/gdnative/include/gdnative/gdnative.h b/modules/gdnative/include/gdnative/gdnative.h index 616c305f25..796ced84f4 100644 --- a/modules/gdnative/include/gdnative/gdnative.h +++ b/modules/gdnative/include/gdnative/gdnative.h @@ -35,7 +35,7 @@ extern "C" { #endif -#ifdef _WIN32 +#if defined(_WIN32) || defined(__ANDROID__) #define GDCALLINGCONV #define GDAPI GDCALLINGCONV #elif defined(__APPLE__) @@ -47,7 +47,7 @@ extern "C" { #define GDCALLINGCONV __attribute__((sysv_abi)) #define GDAPI GDCALLINGCONV #endif -#else +#else // !_WIN32 && !__APPLE__ #define GDCALLINGCONV __attribute__((sysv_abi)) #define GDAPI GDCALLINGCONV #endif |