pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Restored _WIN32 define check

Browse source
This commit is contained in:
Dimitris Panokostas 2019-01-11 13:24:00 +01:00
parent 3cfe48e2ce
commit fc4c15a22b
12 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
guisan-dev/include/guisan/opengl/openglimage.hpp
View file

@ -57,7 +57,7 @@
#ifndef GCN_OPENGLIMAGE_HPP #ifndef GCN_OPENGLIMAGE_HPP
#define GCN_OPENGLIMAGE_HPP #define GCN_OPENGLIMAGE_HPP
#if defined (_WIN32_) #if defined (_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#if defined (DELETE) #if defined (DELETE)

2
guisan-dev/src/opengl/openglgraphics.cpp
View file

@ -60,7 +60,7 @@
#include "guisan/opengl/openglgraphics.hpp" #include "guisan/opengl/openglgraphics.hpp"
#if defined (_WIN32_) #if defined (_WIN32)
#define WIN32_LEAN_AND_MEAN #define WIN32_LEAN_AND_MEAN
#include <windows.h> #include <windows.h>
#endif #endif

2
src/archivers/7z/7zFile.h
View file

@ -4,7 +4,7 @@
#ifndef __7Z_FILE_H #ifndef __7Z_FILE_H
#define __7Z_FILE_H #define __7Z_FILE_H
#ifdef _WIN32_ #ifdef _WIN32
#define USE_WINDOWS_FILE #define USE_WINDOWS_FILE
#endif #endif

2
src/bsdsocket.cpp
View file

@ -1591,7 +1591,7 @@ done:
static uae_u32 REGPARAM2 bsdsocklib_GetSocketEvents(TrapContext *ctx) static uae_u32 REGPARAM2 bsdsocklib_GetSocketEvents(TrapContext *ctx)
{ {
#ifdef _WIN32_ #ifdef _WIN32
struct socketbase *sb = get_socketbase(ctx); struct socketbase *sb = get_socketbase(ctx);
int i; int i;
int flags; int flags;

2
src/filesys.cpp
View file

@ -7508,7 +7508,7 @@ void filesys_install_code (void)
afterdos_initcode = filesys_get_entry(8); afterdos_initcode = filesys_get_entry(8);
} }
#ifdef _WIN32_ #ifdef _WIN32
#include "od-win32/win32_filesys.cpp" #include "od-win32/win32_filesys.cpp"
#endif #endif

2
src/fsdb.cpp
View file

@ -41,7 +41,7 @@ TCHAR *nname_begin (TCHAR *nname)
return nname; return nname;
} }
#ifndef _WIN32_ #ifndef _WIN32
/* Find the name REL in directory DIRNAME. If we find a file that /* Find the name REL in directory DIRNAME. If we find a file that
* has exactly the same name, return REL. If we find a file that * has exactly the same name, return REL. If we find a file that
* has the same name when compared case-insensitively, return a * has the same name when compared case-insensitively, return a

4
src/include/bsdsocket.h
View file

@ -29,7 +29,7 @@ extern void deinit_socket_layer (void);
#define MAXADDRLEN 256 #define MAXADDRLEN 256
#ifdef _WIN32_ #ifdef _WIN32
#define SOCKET_TYPE SOCKET #define SOCKET_TYPE SOCKET
#else #else
#define SOCKET_TYPE int #define SOCKET_TYPE int
@ -70,7 +70,7 @@ struct socketbase {
unsigned int *mtable; /* window messages allocated for asynchronous event notification */ unsigned int *mtable; /* window messages allocated for asynchronous event notification */
/* host-specific fields below */ /* host-specific fields below */
#ifdef _WIN32_ #ifdef _WIN32
SOCKET_TYPE sockAbort; /* for aborting WinSock2 select() (damn Microsoft) */ SOCKET_TYPE sockAbort; /* for aborting WinSock2 select() (damn Microsoft) */
SOCKET_TYPE sockAsync; /* for aborting WSBAsyncSelect() in window message handler */ SOCKET_TYPE sockAsync; /* for aborting WSBAsyncSelect() in window message handler */
int needAbort; /* abort flag */ int needAbort; /* abort flag */

4
src/include/uae/string.h
View file

@ -7,7 +7,7 @@
#include "uae/types.h" #include "uae/types.h"
#include <string.h> #include <string.h>
#ifdef _WIN32_ #ifdef _WIN32
/* Make sure the real _tcs* functions are already declared before we /* Make sure the real _tcs* functions are already declared before we
* re-define them below. */ * re-define them below. */
#include <tchar.h> #include <tchar.h>
@ -15,7 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#ifdef _WIN32_ #ifdef _WIN32
/* Using the real _tcs* functions */ /* Using the real _tcs* functions */
#else #else
#define _istdigit isdigit #define _istdigit isdigit

2
src/include/uae/types.h
View file

@ -53,7 +53,7 @@ typedef uae_u32 uaecptr;
typedef char uae_char; typedef char uae_char;
#ifdef _WIN32_ #ifdef _WIN32
#include <tchar.h> #include <tchar.h>
#ifdef UNICODE #ifdef UNICODE
#define SIZEOF_TCHAR 2 #define SIZEOF_TCHAR 2

2
src/inputdevice.cpp
View file

@ -2806,7 +2806,7 @@ static int handle_input_event(int nr, int state, int max, int autofire)
if (nr <= 0 || nr == INPUTEVENT_SPC_CUSTOM_EVENT) if (nr <= 0 || nr == INPUTEVENT_SPC_CUSTOM_EVENT)
return 0; return 0;
#ifdef _WIN32_ #ifdef _WIN32
// ignore normal GUI event if forced gui key is in use // ignore normal GUI event if forced gui key is in use
if (currprefs.win32_guikey >= 0 && nr == INPUTEVENT_SPC_ENTERGUI) if (currprefs.win32_guikey >= 0 && nr == INPUTEVENT_SPC_ENTERGUI)
return 0; return 0;

4
src/zfile.cpp
View file

@ -1383,7 +1383,7 @@ static struct zfile *zfile_fopen_x (const TCHAR *name, const TCHAR *mode, int ma
return l; return l;
} }
#ifdef _WIN32_ #ifdef _WIN32
static int isinternetfile (const TCHAR *name) static int isinternetfile (const TCHAR *name)
{ {
if (!_tcsnicmp (name, _T("http://"), 7) || !_tcsnicmp (name, _T("https://"), 8)) if (!_tcsnicmp (name, _T("http://"), 7) || !_tcsnicmp (name, _T("https://"), 8))
@ -1490,7 +1490,7 @@ static struct zfile *zfile_fopenx2 (const TCHAR *name, const TCHAR *mode, int ma
struct zfile *f; struct zfile *f;
TCHAR tmp[MAX_DPATH]; TCHAR tmp[MAX_DPATH];
#ifdef _WIN32_ #ifdef _WIN32
if (isinternetfile (name)) if (isinternetfile (name))
return zfile_fopen_internet (name, mode, mask); return zfile_fopen_internet (name, mode, mask);
#endif #endif

6
src/zfile_archive.cpp
View file

@ -12,7 +12,7 @@
#include "sysdeps.h" #include "sysdeps.h"
#ifdef _WIN32_ #ifdef _WIN32
#include <windows.h> #include <windows.h>
#include "win32.h" #include "win32.h"
#endif #endif
@ -676,7 +676,7 @@ static int canrar (void)
if (israr == 0) { if (israr == 0) {
israr = -1; israr = -1;
#ifdef _WIN32_ #ifdef _WIN32
{ {
HMODULE rarlib; HMODULE rarlib;
@ -857,7 +857,7 @@ static aapGetFileInfo aaGetFileInfo;
static aapExtract aaExtract; static aapExtract aaExtract;
static aapCloseArchive aaCloseArchive; static aapCloseArchive aaCloseArchive;
#ifdef _WIN32_ #ifdef _WIN32
static HMODULE arcacc_mod; static HMODULE arcacc_mod;
static void arcacc_free (void) static void arcacc_free (void)