From 07080ff60a181fdd19cc46c64110dad33157b0cf Mon Sep 17 00:00:00 2001 From: Tobias Kortkamp Date: Thu, 3 Aug 2017 15:17:53 +0000 Subject: games/ags: Fix build on CURRENT ../Common/debug/assert.h:44:13: fatal error: expected unqualified-id inline void assert(bool expr) {} ^ /usr/include/assert.h:49:21: note: expanded from macro 'assert' #define assert(e) ((void)0) ^ Reported by: pkg-fallout --- games/ags/files/patch-Common_debug_assert.h | 34 +++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 games/ags/files/patch-Common_debug_assert.h (limited to 'games/ags/files') diff --git a/games/ags/files/patch-Common_debug_assert.h b/games/ags/files/patch-Common_debug_assert.h new file mode 100644 index 000000000000..1129fefbfcca --- /dev/null +++ b/games/ags/files/patch-Common_debug_assert.h @@ -0,0 +1,34 @@ +--- Common/debug/assert.h.orig 2017-08-03 13:21:09 UTC ++++ Common/debug/assert.h +@@ -18,31 +18,6 @@ + #ifndef __AGS_CN_DEBUG__ASSERT_H + #define __AGS_CN_DEBUG__ASSERT_H + +-#ifdef _DEBUG +- +-// TODO: revise this later (add platform-specific output maybe?) +-#if defined(WINDOWS_VERSION) +- +-inline void assert(bool expr) +-{ +- if (!expr) { +- _asm { +- int 3 +- } +- } +-} +- +-#else // !WINDOWS_VERSION +- + #include +- +-#endif +- +-#else // !_DEBUG +- +-// JJS: GCC has trouble with macro overloading +-inline void assert(bool expr) {} +- +-#endif // !_DEBUG + + #endif // __AGS_CN_DEBUG__ASSERT_H -- cgit v1.2.3