Date: Thu, 3 Aug 2017 15:17:53 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r447226 - head/games/ags/files Message-ID: <201708031517.v73FHrNb086224@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Thu Aug 3 15:17:53 2017 New Revision: 447226 URL: https://svnweb.freebsd.org/changeset/ports/447226 Log: 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 Added: head/games/ags/files/patch-Common_debug_assert.h (contents, props changed) Added: head/games/ags/files/patch-Common_debug_assert.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/ags/files/patch-Common_debug_assert.h Thu Aug 3 15:17:53 2017 (r447226) @@ -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 <assert.h> +- +-#endif +- +-#else // !_DEBUG +- +-// JJS: GCC has trouble with macro overloading +-inline void assert(bool expr) {} +- +-#endif // !_DEBUG + + #endif // __AGS_CN_DEBUG__ASSERT_H
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201708031517.v73FHrNb086224>