48 lines
1.3 KiB
Plaintext
48 lines
1.3 KiB
Plaintext
From aa6d604aca37c95a2a5927122c5c0b4893e8eb0c Mon Sep 17 00:00:00 2001
|
|
From: Sergei Reznikov <diver@gelios.net>
|
|
Date: Tue, 9 Oct 2018 16:48:35 +0300
|
|
Subject: Add Haiku support
|
|
|
|
|
|
diff --git a/src/backends/unix/system.c b/src/backends/unix/system.c
|
|
index c4bd90f..ca48738 100644
|
|
--- a/src/backends/unix/system.c
|
|
+++ b/src/backends/unix/system.c
|
|
@@ -68,7 +68,7 @@ Sys_Error(char *error, ...)
|
|
char string[1024];
|
|
|
|
/* change stdin to non blocking */
|
|
- fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) & ~FNDELAY);
|
|
+ fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) & ~O_NDELAY);
|
|
|
|
#ifndef DEDICATED_ONLY
|
|
CL_Shutdown();
|
|
@@ -97,7 +97,7 @@ Sys_Quit(void)
|
|
}
|
|
|
|
Qcommon_Shutdown();
|
|
- fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) & ~FNDELAY);
|
|
+ fcntl(0, F_SETFL, fcntl(0, F_GETFL, 0) & ~O_NDELAY);
|
|
|
|
printf("------------------------------------\n");
|
|
|
|
diff --git a/src/client/input/sdl.c b/src/client/input/sdl.c
|
|
index 051505b..f05da4e 100644
|
|
--- a/src/client/input/sdl.c
|
|
+++ b/src/client/input/sdl.c
|
|
@@ -1374,9 +1374,9 @@ IN_Init(void)
|
|
SDL_StartTextInput();
|
|
|
|
/* Joystick init */
|
|
- if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC))
|
|
+ if (!SDL_WasInit(SDL_INIT_GAMECONTROLLER))
|
|
{
|
|
- if (SDL_Init(SDL_INIT_GAMECONTROLLER | SDL_INIT_HAPTIC) == -1)
|
|
+ if (SDL_Init(SDL_INIT_GAMECONTROLLER) == -1)
|
|
{
|
|
Com_Printf ("Couldn't init SDL joystick: %s.\n", SDL_GetError ());
|
|
}
|
|
--
|
|
2.28.0
|
|
|