Skip to content
Snippets Groups Projects
Commit dbb1d808 authored by Alam Ed Arias's avatar Alam Ed Arias
Browse files

Merge branch 'master' into next

parents 776dafa0 ed0d70fe
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
src/CMakeLists.txt
+ 0
− 1
View file @ dbb1d808
...@@ -77,7 +77,6 @@ set(SRB2_CORE_HEADERS ...@@ -77,7 +77,6 @@ set(SRB2_CORE_HEADERS
b_bot.h b_bot.h
byteptr.h byteptr.h
command.h command.h
comptime.h
console.h console.h
d_clisrv.h d_clisrv.h
d_event.h d_event.h
......
src/m_misc.c
+ 2
− 0
View file @ dbb1d808
...@@ -50,7 +50,9 @@ ...@@ -50,7 +50,9 @@
#ifdef HAVE_SDL #ifdef HAVE_SDL
#include "sdl/hwsym_sdl.h" #include "sdl/hwsym_sdl.h"
#ifdef __linux__ #ifdef __linux__
#ifndef _LARGEFILE64_SOURCE
typedef off_t off64_t; typedef off_t off64_t;
#neidf
#endif #endif
#endif #endif
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment