Define LEGACY_WIN32 only in the files that need it

This commit is contained in:
libretroadmin 2025-08-04 00:54:15 +02:00
parent 537712a634
commit 732f598fd0
6 changed files with 10 additions and 20 deletions

View File

@ -16,11 +16,9 @@
/* Assume W-functions do not work below Win2K and Xbox platforms */
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
#ifndef LEGACY_WIN32
#define LEGACY_WIN32
#endif
#endif
#ifdef _WIN32

View File

@ -70,11 +70,9 @@
/* Assume W-functions do not work below Win2K and Xbox platforms */
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
#ifndef LEGACY_WIN32
#define LEGACY_WIN32
#endif
#endif
/* For some reason this is missing from mingw winuser.h */

View File

@ -38,12 +38,6 @@
#include <signal.h>
#endif
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
#ifndef LEGACY_WIN32
#define LEGACY_WIN32
#endif
#endif
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
#include <objbase.h>
#include <process.h>

View File

@ -22,6 +22,12 @@
#include "config.h"
#endif
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
#ifndef LEGACY_WIN32
#define LEGACY_WIN32
#endif
#endif
#include <encodings/utf.h>
#include <string/stdstring.h>
#include <streams/file_stream.h>

View File

@ -40,12 +40,6 @@
#include <signal.h>
#endif
#if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0500 || defined(_XBOX)
#ifndef LEGACY_WIN32
#define LEGACY_WIN32
#endif
#endif
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
#include <objbase.h>
#include <process.h>

View File

@ -127,7 +127,7 @@ static void ui_window_win32_set_title(void *data, char *buf)
void ui_window_win32_set_droppable(void *data, bool droppable)
{
/* Minimum supported client: Windows XP,
/* Minimum supported client: Windows XP,
* minimum supported server: Windows 2000 Server */
ui_window_win32_t *window = (ui_window_win32_t*)data;
if (DragAcceptFiles_func)
@ -264,8 +264,8 @@ static bool ui_browser_window_win32_core(
ofn.nMaxFileTitle = 0;
ofn.lpstrInitialDir = state->startdir;
ofn.lpstrTitle = state->title;
ofn.Flags = OFN_FILEMUSTEXIST
| OFN_HIDEREADONLY
ofn.Flags = OFN_FILEMUSTEXIST
| OFN_HIDEREADONLY
| OFN_NOCHANGEDIR;
ofn.nFileOffset = 0;
ofn.nFileExtension = 0;
@ -319,7 +319,7 @@ static ui_browser_window_t ui_browser_window_win32 = {
"win32"
};
static void ui_companion_win32_deinit(void *data) { }
static void ui_companion_win32_deinit(void *data) { }
static void *ui_companion_win32_init(void) { return (void*)-1; }
static void ui_companion_win32_toggle(void *data, bool force) { }
static void ui_companion_win32_event_command(