noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Merge pull request #27711 from neikeq/ifdef-clang-tidy

Browse Source 
Replace a few #if/#elif with #ifdef and "#elif defined"
This commit is contained in:
Rémi Verschelde
2019-04-08 12:24:30 +02:00
committed by GitHub
parent 3cf2bdbd84 ad2127a3e8
commit 918de768a5
11 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/mono/editor/godotsharp_editor.cpp
View File

@@ -502,11 +502,11 @@ GodotSharpEditor::GodotSharpEditor(EditorNode *p_editor) {
String settings_hint_str = "Disabled";
#ifdef WINDOWS_ENABLED
#if defined(WINDOWS_ENABLED)
settings_hint_str += ",MonoDevelop,Visual Studio Code";
#elif OSX_ENABLED
#elif defined(OSX_ENABLED)
settings_hint_str += ",Visual Studio,MonoDevelop,Visual Studio Code";
#elif UNIX_ENABLED
#elif defined(UNIX_ENABLED)
settings_hint_str += ",MonoDevelop,Visual Studio Code";
#endif

6
modules/mono/editor/godotsharp_editor.h
View File

@@ -81,15 +81,15 @@ public:
enum ExternalEditor {
EDITOR_NONE,
#ifdef WINDOWS_ENABLED
#if defined(WINDOWS_ENABLED)
//EDITOR_VISUALSTUDIO, // TODO
EDITOR_MONODEVELOP,
EDITOR_VSCODE
#elif OSX_ENABLED
#elif defined(OSX_ENABLED)
EDITOR_VISUALSTUDIO_MAC,
EDITOR_MONODEVELOP,
EDITOR_VSCODE
#elif UNIX_ENABLED
#elif defined(UNIX_ENABLED)
EDITOR_MONODEVELOP,
EDITOR_VSCODE
#endif

4
modules/mono/mono_gd/gd_mono.cpp
View File

@@ -212,7 +212,7 @@ void GDMono::initialize() {
String config_dir;
#ifdef TOOLS_ENABLED
#ifdef WINDOWS_ENABLED
#if defined(WINDOWS_ENABLED)
mono_reg_info = MonoRegUtils::find_mono();
if (mono_reg_info.assembly_dir.length() && DirAccess::exists(mono_reg_info.assembly_dir)) {
@@ -222,7 +222,7 @@ void GDMono::initialize() {
if (mono_reg_info.config_dir.length() && DirAccess::exists(mono_reg_info.config_dir)) {
config_dir = mono_reg_info.config_dir;
}
#elif OSX_ENABLED
#elif defined(OSX_ENABLED)
const char *c_assembly_rootdir = mono_assembly_getrootdir();
const char *c_config_dir = mono_get_config_dir();

4
modules/mono/utils/thread_local.h
View File

@@ -39,7 +39,7 @@
#error Platform or compiler not supported
#endif
#ifdef __GNUC__
#if defined(__GNUC__)
#ifdef HAVE_GCC___THREAD
#define _THREAD_LOCAL_(m_t) __thread m_t
@@ -47,7 +47,7 @@
#define USE_CUSTOM_THREAD_LOCAL
#endif
#elif _MSC_VER
#elif defined(_MSC_VER)
#ifdef HAVE_DECLSPEC_THREAD
#define _THREAD_LOCAL_(m_t) __declspec(thread) m_t