Merge branch 'master' into next

This commit is contained in:
Alam Ed Arias 2015-02-05 17:33:00 -05:00
commit dbb1d8088e
2 changed files with 2 additions and 1 deletions

View File

@ -77,7 +77,6 @@ set(SRB2_CORE_HEADERS
b_bot.h
byteptr.h
command.h
comptime.h
console.h
d_clisrv.h
d_event.h

View File

@ -50,7 +50,9 @@
#ifdef HAVE_SDL
#include "sdl/hwsym_sdl.h"
#ifdef __linux__
#ifndef _LARGEFILE64_SOURCE
typedef off_t off64_t;
#neidf
#endif
#endif