zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- Preventive fix for future include conflicts. 

basicinlines.h is only included in m_fixed.h, while basictypes.h is included only in headers, so it's better to respect this convention. OSX compiles fine also without m_fixed.h, even better.
This commit is contained in:
Edoardo Prezioso 2016-11-23 16:24:56 +01:00
parent dc11b63157
commit 68dc3c4f2d
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/posix/cocoa/i_timer.cpp
View File

@ -37,8 +37,6 @@
#include <pthread.h> #include <pthread.h>
#include <libkern/OSAtomic.h> #include <libkern/OSAtomic.h>
#include "basictypes.h"
#include "basicinlines.h"
#include "doomdef.h" #include "doomdef.h"
#include "i_system.h" #include "i_system.h"
#include "templates.h" #include "templates.h"

3
src/posix/sdl/i_timer.cpp
View File

@ -7,8 +7,7 @@
#include <SDL.h> #include <SDL.h>
#include "basictypes.h" #include "m_fixed.h"
#include "basicinlines.h"
#include "hardware.h" #include "hardware.h"
#include "i_system.h" #include "i_system.h"
#include "templates.h" #include "templates.h"