lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master' into next

Browse source
This commit is contained in:
Alam Ed Arias 2015-02-05 17:33:00 -05:00
parent 776dafa0bb ed0d70feca
commit dbb1d8088e
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/CMakeLists.txt
View file

@ -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

2
src/m_misc.c
View file

@ -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