mirror of
https://github.com/godotengine/godot
synced 2024-09-05 04:38:26 +00:00
Cleanup unused defines in platform code
This commit is contained in:
parent
e413d1c9c3
commit
a92c564a02
|
@ -28,7 +28,7 @@
|
|||
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
|
||||
/*************************************************************************/
|
||||
|
||||
#if defined(UNIX_ENABLED) || defined(PTHREAD_ENABLED)
|
||||
#if defined(UNIX_ENABLED)
|
||||
|
||||
#include "thread_posix.h"
|
||||
|
||||
|
@ -73,4 +73,4 @@ void init_thread_posix() {
|
|||
Thread::_set_platform_functions({ .set_name = set_name });
|
||||
}
|
||||
|
||||
#endif // UNIX_ENABLED || PTHREAD_ENABLED
|
||||
#endif // UNIX_ENABLED
|
||||
|
|
|
@ -31,14 +31,10 @@
|
|||
#ifndef JOYPAD_MACOS_H
|
||||
#define JOYPAD_MACOS_H
|
||||
|
||||
#ifdef MACOS_10_0_4
|
||||
#import <IOKit/hidsystem/IOHIDUsageTables.h>
|
||||
#else
|
||||
#import <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
|
||||
#endif
|
||||
#import <ForceFeedback/ForceFeedback.h>
|
||||
#import <ForceFeedback/ForceFeedbackConstants.h>
|
||||
#import <IOKit/hid/IOHIDLib.h>
|
||||
#import <Kernel/IOKit/hidsystem/IOHIDUsageTables.h>
|
||||
|
||||
#include "core/input/input.h"
|
||||
|
||||
|
|
|
@ -826,10 +826,6 @@ OS_UWP::OS_UWP() {
|
|||
pressrc = 0;
|
||||
old_invalid = true;
|
||||
mouse_mode = MOUSE_MODE_VISIBLE;
|
||||
#ifdef STDOUT_FILE
|
||||
stdo = fopen("stdout.txt", "wb");
|
||||
#endif
|
||||
|
||||
gl_context = nullptr;
|
||||
|
||||
display_request = ref new Windows::System::Display::DisplayRequest();
|
||||
|
@ -847,7 +843,4 @@ OS_UWP::OS_UWP() {
|
|||
}
|
||||
|
||||
OS_UWP::~OS_UWP() {
|
||||
#ifdef STDOUT_FILE
|
||||
fclose(stdo);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -1123,15 +1123,7 @@ Error OS_Windows::move_to_trash(const String &p_path) {
|
|||
}
|
||||
|
||||
OS_Windows::OS_Windows(HINSTANCE _hInstance) {
|
||||
ticks_per_second = 0;
|
||||
ticks_start = 0;
|
||||
main_loop = nullptr;
|
||||
process_map = nullptr;
|
||||
|
||||
hInstance = _hInstance;
|
||||
#ifdef STDOUT_FILE
|
||||
stdo = fopen("stdout.txt", "wb");
|
||||
#endif
|
||||
|
||||
#ifdef WASAPI_ENABLED
|
||||
AudioDriverManager::add_driver(&driver_wasapi);
|
||||
|
@ -1163,7 +1155,4 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) {
|
|||
}
|
||||
|
||||
OS_Windows::~OS_Windows() {
|
||||
#ifdef STDOUT_FILE
|
||||
fclose(stdo);
|
||||
#endif
|
||||
}
|
||||
|
|
|
@ -84,13 +84,10 @@ public:
|
|||
};
|
||||
|
||||
class JoypadWindows;
|
||||
class OS_Windows : public OS {
|
||||
#ifdef STDOUT_FILE
|
||||
FILE *stdo = nullptr;
|
||||
#endif
|
||||
|
||||
uint64_t ticks_start;
|
||||
uint64_t ticks_per_second;
|
||||
class OS_Windows : public OS {
|
||||
uint64_t ticks_start = 0;
|
||||
uint64_t ticks_per_second = 0;
|
||||
|
||||
HINSTANCE hInstance;
|
||||
MainLoop *main_loop = nullptr;
|
||||
|
@ -130,7 +127,7 @@ protected:
|
|||
STARTUPINFO si;
|
||||
PROCESS_INFORMATION pi;
|
||||
};
|
||||
HashMap<ProcessID, ProcessInfo> *process_map;
|
||||
HashMap<ProcessID, ProcessInfo> *process_map = nullptr;
|
||||
|
||||
public:
|
||||
virtual void alert(const String &p_alert, const String &p_title = "ALERT!") override;
|
||||
|
|
Loading…
Reference in a new issue