zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added some Linux fixes that were needed after the last commit.

Browse source 
SVN r327 (trunk)
This commit is contained in:
Randy Heit 2006-09-14 00:17:10 +00:00
parent c412b42703
commit 76e94bde6b
6 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/cmdlib.cpp
View file

@ -315,8 +315,8 @@ bool CheckWildcards (const char *pattern, const char *text)
void FormatGUID (char *text, const GUID &guid) void FormatGUID (char *text, const GUID &guid)
{ {
sprintf (text, "{%08lx-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}", sprintf (text, "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}",
guid.Data1, guid.Data2, guid.Data3, (uint32)guid.Data1, guid.Data2, guid.Data3,
guid.Data4[0], guid.Data4[1], guid.Data4[0], guid.Data4[1],
guid.Data4[2], guid.Data4[3], guid.Data4[2], guid.Data4[3],
guid.Data4[4], guid.Data4[5], guid.Data4[4], guid.Data4[5],

2
src/i_net.cpp
View file

@ -37,6 +37,7 @@
# define WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN
# include <windows.h> # include <windows.h>
# include <winsock.h> # include <winsock.h>
#define USE_WINDOWS_DWORD
#else #else
# include <sys/socket.h> # include <sys/socket.h>
# include <netinet/in.h> # include <netinet/in.h>
@ -47,7 +48,6 @@
# include <sys/ioctl.h> # include <sys/ioctl.h>
#endif #endif
#define USE_WINDOWS_DWORD
#include "doomtype.h" #include "doomtype.h"
#include "i_system.h" #include "i_system.h"
#include "d_event.h" #include "d_event.h"

2
src/sdl/i_input.cpp
View file

@ -23,7 +23,7 @@ static void I_CheckNativeMouse ();
static bool GUICapture; static bool GUICapture;
static bool NativeMouse = true; static bool NativeMouse = true;
extern BOOL paused; extern int paused;
CVAR (Bool, use_mouse, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Bool, use_mouse, true, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)
CVAR (Bool, m_noprescale, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG) CVAR (Bool, m_noprescale, false, CVAR_ARCHIVE|CVAR_GLOBALCONFIG)

11
src/sdl/i_system.cpp
View file

@ -25,14 +25,7 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <fnmatch.h> #include <fnmatch.h>
#ifdef OSF1
#define _XOPEN_SOURCE_EXTENDED
#endif
#include <unistd.h> #include <unistd.h>
#ifdef OSF1
#undef _XOPEN_SOURCE_EXTENDED
#endif
#include <stdarg.h> #include <stdarg.h>
#include <sys/types.h> #include <sys/types.h>
@ -66,7 +59,7 @@
EXTERN_CVAR (String, language) EXTERN_CVAR (String, language)
#ifdef USEASM #ifdef USEASM
extern "C" BOOL STACK_ARGS CheckMMX (CPUInfo *cpu); extern "C" void STACK_ARGS CheckMMX (CPUInfo *cpu);
#endif #endif
extern "C" extern "C"
@ -295,7 +288,7 @@ bool gameisdead;
void STACK_ARGS I_FatalError (const char *error, ...) void STACK_ARGS I_FatalError (const char *error, ...)
{ {
static BOOL alreadyThrown = false; static bool alreadyThrown = false;
gameisdead = true; gameisdead = true;
if (!alreadyThrown) // ignore all but the first message -- killough if (!alreadyThrown) // ignore all but the first message -- killough

2
src/sound/fmodsound.cpp
View file

@ -38,12 +38,12 @@
#include <mmsystem.h> #include <mmsystem.h>
#include "resource.h" #include "resource.h"
extern HWND Window; extern HWND Window;
#define USE_WINDOWS_DWORD
#else #else
#define FALSE 0 #define FALSE 0
#define TRUE 1 #define TRUE 1
#endif #endif
#define USE_WINDOWS_DWORD
#include "templates.h" #include "templates.h"
#include "fmodsound.h" #include "fmodsound.h"
#include "c_cvars.h" #include "c_cvars.h"

2
src/sound/i_sound.cpp
View file

@ -39,6 +39,7 @@
#include "resource.h" #include "resource.h"
extern HWND Window; extern HWND Window;
extern HINSTANCE g_hInst; extern HINSTANCE g_hInst;
#define USE_WINDOWS_DWORD
#else #else
#define FALSE 0 #define FALSE 0
#define TRUE 1 #define TRUE 1
@ -48,7 +49,6 @@ extern HINSTANCE g_hInst;
#include <stdlib.h> #include <stdlib.h>
#include <stdarg.h> #include <stdarg.h>
#define USE_WINDOWS_DWORD
#include "doomtype.h" #include "doomtype.h"
#include "m_alloc.h" #include "m_alloc.h"
#include <math.h> #include <math.h>