qf
/
quakeforge
mirror of https://git.code.sf.net/p/quake/quakeforge
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

be consistent with WIN32 and _WIN32 (now all _WIN32)

This commit is contained in:
Bill Currie 2004-01-20 03:47:27 +00:00
parent cf074b14f7
commit e154c9add5
21 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -1546,7 +1546,7 @@ fi
AS="$CC"
if test "x$SYSTYPE" = "xWIN32"; then
ASFLAGS="\$(DEFS) \$(CFLAGS) \$(CPPFLAGS) \$(DEFAULT_INCLUDES) \$(INCLUDES) -DWIN32"
ASFLAGS="\$(DEFS) \$(CFLAGS) \$(CPPFLAGS) \$(DEFAULT_INCLUDES) \$(INCLUDES) -D_WIN32"
plugin_ldflags="-no-undefined"
plugin_libadd="-luser32 -lgdi32 -lwinmm"
else

2
include/QF/mathlib.h
View File

@ -36,7 +36,7 @@
# define M_PI 3.14159265358979323846 // matches value in gcc v2 math.h
#endif
#ifdef WIN32
#ifdef _WIN32
# if defined (DLL_EXPORT) && defined (BUILD_QFutil)
# define QFutil_IMPORT
# else

2
libs/audio/renderer/snd_mixa.S
View File

@ -34,7 +34,7 @@
#ifdef USE_INTEL_ASM
#ifdef WIN32
#ifdef _WIN32
# undef PIC //no such thing in win32
#endif

2
libs/console/filelist.c
View File

@ -52,7 +52,7 @@ static __attribute__ ((unused)) const char rcsid[] =
# include <fnmatch.h>
# undef model_t
#else
# ifdef WIN32
# ifdef _WIN32
# include "fnmatch.h"
# endif
#endif

2
libs/ruamoko/rua_file.c
View File

@ -44,7 +44,7 @@ static __attribute__ ((unused)) const char rcsid[] =
# include <fnmatch.h>
# undef model_t
#else
# ifdef WIN32
# ifdef _WIN32
# include "fnmatch.h"
# endif
#endif

2
libs/util/math.S
View File

@ -35,7 +35,7 @@
#ifdef USE_INTEL_ASM
#ifdef WIN32
#ifdef _WIN32
# undef PIC //no such thing in win32
#endif

2
libs/util/pakfile.c
View File

@ -259,7 +259,7 @@ make_parents (const char *_path)
for (p = path; *p && (d = strchr (p, '/')); p = d + 1) {
t = *d;
*d = 0;
#ifdef WIN32
#ifdef _WIN32
if (mkdir (path) < 0)
#else
if (mkdir (path, 0777) < 0)

2
libs/util/quakefs.c
View File

@ -59,7 +59,7 @@ static __attribute__ ((unused)) const char rcsid[] =
# include <fnmatch.h>
# undef model_t
#else
# ifdef WIN32
# ifdef _WIN32
# include "fnmatch.h"
# endif
#endif

6
libs/util/quakeio.c
View File

@ -62,7 +62,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "QF/quakefs.h"
#include "QF/quakeio.h"
#ifdef WIN32
#ifdef _WIN32
# ifndef __BORLANDC__
# define setmode _setmode
# define O_BINARY _O_BINARY
@ -196,7 +196,7 @@ Qdopen (int fd, const char *mode)
int zip = 0;
m = alloca (strlen (mode) + 1);
#ifdef WIN32
#ifdef _WIN32
setmode (fd, O_BINARY);
#endif
for (p = m; *mode && p - m < ((int) sizeof (m) - 1); mode++) {
@ -240,7 +240,7 @@ Qsubopen (const char *path, int offs, int len, int zip)
if (fd == -1)
return 0;
#ifdef WIN32
#ifdef _WIN32
setmode (fd, O_BINARY);
#endif

4
libs/util/sys.c
View File

@ -213,7 +213,7 @@ Sys_Print (FILE *stream, const char *fmt, va_list args)
dvsprintf (msg, fmt, args);
if (stream == stderr) {
#ifdef WIN32
#ifdef _WIN32
MessageBox (NULL, msg->str, "Fatal Error", 0 /* MB_OK */ );
#endif
fputs ("Fatal Error: ", stream);
@ -464,7 +464,7 @@ Sys_TimeID (void) //FIXME I need a new name, one that doesn't make me feel 3 fee
void
Sys_PageIn (void *ptr, int size)
{
//may or may not be useful in linux #ifdef WIN32
//may or may not be useful in linux #ifdef _WIN32
byte *x;
int m, n;

2
libs/util/sys_ia32.S
View File

@ -34,7 +34,7 @@
#ifdef USE_INTEL_ASM
#ifdef WIN32
#ifdef _WIN32
# undef PIC //no such thing in win32
#endif

2
libs/util/wadfile.c
View File

@ -321,7 +321,7 @@ make_parents (const char *_path)
for (p = path; *p && (d = strchr (p, '/')); p = d + 1) {
t = *d;
*d = 0;
#ifdef WIN32
#ifdef _WIN32
if (mkdir (path) < 0)
#else
if (mkdir (path, 0777) < 0)

2
libs/video/renderer/sw/fpua.S
View File

@ -34,7 +34,7 @@
#ifdef USE_INTEL_ASM
#ifdef WIN32
#ifdef _WIN32
# undef PIC //no such thing in win32
#endif

2
libs/video/renderer/sw/sw_raclipa.S
View File

@ -37,7 +37,7 @@
#ifdef USE_INTEL_ASM
#ifdef WIN32
#ifdef _WIN32
# undef PIC
#endif

4
libs/video/targets/vid_sdl.c
View File

@ -49,7 +49,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "d_iface.h"
#ifdef WIN32 // FIXME: evil hack to get full DirectSound support with SDL
#ifdef _WIN32 // FIXME: evil hack to get full DirectSound support with SDL
#include <windows.h>
#include <SDL_syswm.h>
HWND mainwindow;
@ -126,7 +126,7 @@ VID_Init (unsigned char *palette)
SDL_ShowCursor (0); // hide the mouse pointer
#ifdef WIN32
#ifdef _WIN32
// FIXME: EVIL thing - but needed for win32 until
// SDL_sound works better - without this DirectSound fails.

4
libs/video/targets/vid_sdl32.c
View File

@ -50,7 +50,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "d_iface.h"
#include "d_local.h"
#ifdef WIN32 // FIXME: evil hack to get full DirectSound support with SDL
#ifdef _WIN32 // FIXME: evil hack to get full DirectSound support with SDL
#include <windows.h>
#include <SDL_syswm.h>
HWND mainwindow;
@ -163,7 +163,7 @@ VID_Init (unsigned char *palette)
SDL_ShowCursor (0); // initialize the mouse
#ifdef WIN32
#ifdef _WIN32
// FIXME: EVIL thing - but needed for win32 until
// SDL_sound works better - without this DirectSound fails.

6
libs/video/targets/vid_sgl.c
View File

@ -55,7 +55,7 @@ static __attribute__ ((unused)) const char rcsid[] =
#include "r_cvar.h"
#include "sbar.h"
#ifdef WIN32 // FIXME: evil hack to get full DirectSound support with SDL
#ifdef _WIN32 // FIXME: evil hack to get full DirectSound support with SDL
# include <windows.h>
# include <SDL_syswm.h>
HWND mainwindow;
@ -131,7 +131,7 @@ VID_Init (unsigned char *palette)
// Check if we want fullscreen
if (vid_fullscreen->int_val) {
flags |= SDL_FULLSCREEN;
#ifndef WIN32 // Don't annoy Mesa/3dfx folks
#ifndef _WIN32 // Don't annoy Mesa/3dfx folks
// FIXME: Maybe this could be put in a different spot, but I don't
// know where. Anyway, it's to work around a 3Dfx Glide bug.
// Cvar_SetValue (in_grab, 1); // Needs #include "QF/input.h"
@ -197,7 +197,7 @@ success:
SDL_ShowCursor (0); // hide the mouse pointer
#ifdef WIN32
#ifdef _WIN32
// FIXME: EVIL thing - but needed for win32 until
// SDL_sound works better - without this DirectSound fails.

4
nq/source/sys_sdl.c
View File

@ -79,7 +79,7 @@ int noconinput;
static void
startup (void)
{
#ifdef WIN32
#ifdef _WIN32
OSVERSIONINFO vinfo;
Sys_MaskFPUExceptions ();
@ -124,7 +124,7 @@ SDL_main (int c, char **v)
host_parms.argc = com_argc;
host_parms.argv = com_argv;
#ifndef WIN32
#ifndef _WIN32
noconinput = COM_CheckParm ("-noconinput");
if (!noconinput)
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);

4
qw/source/cl_sys_sdl.c
View File

@ -80,7 +80,7 @@ int noconinput;
static void
startup (void)
{
#ifdef WIN32
#ifdef _WIN32
OSVERSIONINFO vinfo;
Sys_MaskFPUExceptions ();
@ -125,7 +125,7 @@ SDL_main (int c, char **v)
host_parms.argc = com_argc;
host_parms.argv = com_argv;
#ifndef WIN32
#ifndef _WIN32
noconinput = COM_CheckParm ("-noconinput");
if (!noconinput)
fcntl (0, F_SETFL, fcntl (0, F_GETFL, 0) | O_NONBLOCK);

2
qw/source/sv_main.c
View File

@ -1173,7 +1173,7 @@ SV_PrintIP (byte *ip)
static char buf[INET6_ADDRSTRLEN];
if (!inet_ntop (AF_INET6, ip, buf, INET6_ADDRSTRLEN))
#else
# ifdef WIN32
# ifdef _WIN32
static char buf[16];
strcpy (buf, inet_ntoa (*(struct in_addr*)ip));
if (0)

6
tools/qfmodelgen/source/cmdlib.c
View File

@ -29,7 +29,7 @@
#include "cmdlib.h"
#ifdef WIN32
#ifdef _WIN32
#include <direct.h>
#endif
@ -160,7 +160,7 @@ I_FloatTime (void)
void
Q_getwd (char *out)
{
#ifdef WIN32
#ifdef _WIN32
_getcwd (out, 256);
strcat (out, "\\");
#else
@ -171,7 +171,7 @@ Q_getwd (char *out)
void
Q_mkdir (char *path)
{
#ifdef WIN32
#ifdef _WIN32
if (_mkdir (path) != -1)
return;
#else