Replace use of preprocessor macro WIN32 with _WIN32. (Blame clang.)

git-svn-id: https://svn.eduke32.com/eduke32@3839 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2013-06-01 06:57:00 +00:00
parent 899f19155d
commit e0a373893a
9 changed files with 11 additions and 11 deletions

View file

@ -130,7 +130,7 @@ nedmalloc.dll.
*/ */
#ifndef NEDMALLOCEXTSPEC #ifndef NEDMALLOCEXTSPEC
#ifdef NEDMALLOC_DLL_EXPORTS #ifdef NEDMALLOC_DLL_EXPORTS
#ifdef WIN32 #ifdef _WIN32
#define NEDMALLOCEXTSPEC extern __declspec(dllexport) #define NEDMALLOCEXTSPEC extern __declspec(dllexport)
#elif defined(__GNUC__) #elif defined(__GNUC__)
#define NEDMALLOCEXTSPEC extern __attribute__ ((visibility("default"))) #define NEDMALLOCEXTSPEC extern __attribute__ ((visibility("default")))
@ -238,7 +238,7 @@ Always turns on ENABLE_TOLERANT_NEDMALLOC.
#ifndef ENABLE_TOLERANT_NEDMALLOC #ifndef ENABLE_TOLERANT_NEDMALLOC
#define ENABLE_TOLERANT_NEDMALLOC 1 #define ENABLE_TOLERANT_NEDMALLOC 1
#endif #endif
#ifndef WIN32 /* We have a dedicated patcher for Windows */ #ifndef _WIN32 /* We have a dedicated patcher for Windows */
#define nedmalloc malloc #define nedmalloc malloc
#define nedmalloc2 malloc2 #define nedmalloc2 malloc2
#define nedcalloc calloc #define nedcalloc calloc

View file

@ -11,7 +11,7 @@ extern "C" {
#include <stdlib.h> #include <stdlib.h>
#ifdef WIN32 #ifdef _WIN32
#include "enet/win32.h" #include "enet/win32.h"
#else #else
#include "enet/unix.h" #include "enet/unix.h"

View file

@ -1613,7 +1613,7 @@ enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int ch
enet_uint32 packetLoss = currentPeer -> packetsLost * ENET_PEER_PACKET_LOSS_SCALE / currentPeer -> packetsSent; enet_uint32 packetLoss = currentPeer -> packetsLost * ENET_PEER_PACKET_LOSS_SCALE / currentPeer -> packetsSent;
#ifdef ENET_DEBUG #ifdef ENET_DEBUG
#ifdef WIN32 #ifdef _WIN32
printf ( printf (
#else #else
fprintf (stderr, fprintf (stderr,
@ -1663,7 +1663,7 @@ enet_protocol_send_outgoing_commands (ENetHost * host, ENetEvent * event, int ch
host -> headerFlags |= ENET_PROTOCOL_HEADER_FLAG_COMPRESSED; host -> headerFlags |= ENET_PROTOCOL_HEADER_FLAG_COMPRESSED;
shouldCompress = compressedSize; shouldCompress = compressedSize;
#ifdef ENET_DEBUG_COMPRESS #ifdef ENET_DEBUG_COMPRESS
#ifdef WIN32 #ifdef _WIN32
printf ( printf (
#else #else
fprintf (stderr, fprintf (stderr,

View file

@ -2,7 +2,7 @@
@file unix.c @file unix.c
@brief ENet Unix system specific functions @brief ENet Unix system specific functions
*/ */
#ifndef WIN32 #ifndef _WIN32
#ifndef UNREFERENCED_PARAMETER #ifndef UNREFERENCED_PARAMETER
#define UNREFERENCED_PARAMETER(x) x=x #define UNREFERENCED_PARAMETER(x) x=x

View file

@ -2,7 +2,7 @@
@file win32.c @file win32.c
@brief ENet Win32 system specific functions @brief ENet Win32 system specific functions
*/ */
#ifdef WIN32 #ifdef _WIN32
#include <time.h> #include <time.h>
#define ENET_BUILDING_LIB 1 #define ENET_BUILDING_LIB 1

View file

@ -10736,7 +10736,7 @@ static void G_Startup(void)
{ {
initprintf("IT IS NOW TIME TO UPGRADE TO THE COMPLETE VERSION!!!\n"); initprintf("IT IS NOW TIME TO UPGRADE TO THE COMPLETE VERSION!!!\n");
#ifdef WIN32 #ifdef _WIN32
Bsprintf(tempbuf, "You have run Duke Nukem 3D shareware %d times. It is now time to upgrade to the complete version!\n\n" Bsprintf(tempbuf, "You have run Duke Nukem 3D shareware %d times. It is now time to upgrade to the complete version!\n\n"
"Purchase Duke Nukem 3D for $5.99 now?\n", ud.executions); "Purchase Duke Nukem 3D for $5.99 now?\n", ud.executions);

View file

@ -6269,7 +6269,7 @@ void C_Compile(const char *filenam)
if (g_loadFromGroupOnly == 1 || numgroupfiles == 0) if (g_loadFromGroupOnly == 1 || numgroupfiles == 0)
{ {
# ifdef WIN32 # ifdef _WIN32
Bsprintf(tempbuf,"Duke Nukem 3D game data was not found. A valid copy of \"%s\" or other compatible data is needed to run EDuke32.\n\n" Bsprintf(tempbuf,"Duke Nukem 3D game data was not found. A valid copy of \"%s\" or other compatible data is needed to run EDuke32.\n\n"
"You can find \"%s\" in the \"DN3DINST\" or \"ATOMINST\" directory on your Duke Nukem 3D installation CD-ROM.\n\n" "You can find \"%s\" in the \"DN3DINST\" or \"ATOMINST\" directory on your Duke Nukem 3D installation CD-ROM.\n\n"
"If you don't already own a copy of Duke or haven't seen your disc in years, don't worry -- you can download the full, registered " "If you don't already own a copy of Duke or haven't seen your disc in years, don't worry -- you can download the full, registered "

View file

@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "osd.h" #include "osd.h"
#include "sounds.h" #include "sounds.h"
#ifdef WIN32 #ifdef _WIN32
#include "winlayer.h" #include "winlayer.h"
#endif #endif

View file

@ -38,7 +38,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "macros.h" #include "macros.h"
#include "mathutil.h" #include "mathutil.h"
#ifdef WIN32 #ifdef _WIN32
#include "winlayer.h" #include "winlayer.h"
#endif #endif