teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2024-11-15 08:52:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add #pragma once to debugbreak.h and remove it from separate inclusion in a couple of translation units as we're including it directly in compat.h now

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8192 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/build/src/sdlayer.cpp
#	source/duke3d/src/gamedef.cpp
This commit is contained in:
terminx 2019-10-19 23:45:36 +00:00 committed by Christoph Oelckers
parent d7f779eaec
commit ba02bbaf67
4 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/build/src/compat.cpp
View file

@ -4,7 +4,6 @@
#define LIBDIVIDE_BODY #define LIBDIVIDE_BODY
#include "compat.h" #include "compat.h"
#include "debugbreak.h"
#ifdef _WIN32 #ifdef _WIN32
# define NEED_SHLOBJ_H # define NEED_SHLOBJ_H

1
source/duke3d/src/gamedef.cpp
View file

@ -28,7 +28,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "common.h" #include "common.h"
#include "common_game.h" #include "common_game.h"
#include "crc32_.h" #include "crc32_.h"
#include "debugbreak.h"
#include "duke3d.h" #include "duke3d.h"
#include "gameexec.h" #include "gameexec.h"
#include "namesdyn.h" #include "namesdyn.h"

1
source/duke3d/src/gameexec.cpp
View file

@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#include "cmdline.h" #include "cmdline.h"
#include "colmatch.h" #include "colmatch.h"
#include "compat.h" #include "compat.h"
#include "debugbreak.h"
#include "duke3d.h" #include "duke3d.h"
#include "input.h" #include "input.h"
#include "menus.h" #include "menus.h"

2
source/thirdparty/include/debugbreak.h vendored
View file

@ -25,6 +25,8 @@
*/ */
#ifndef DEBUG_BREAK_H #ifndef DEBUG_BREAK_H
#pragma once
#ifdef _MSC_VER #ifdef _MSC_VER
#define debug_break __debugbreak #define debug_break __debugbreak