From 7790e994eb6f2ba60349e7f2b8f4fb04b50cc6c4 Mon Sep 17 00:00:00 2001 From: Stanislav Shwartsman Date: Thu, 17 Oct 2013 19:22:16 +0000 Subject: [PATCH] do not touch inline definition under C++ - added issue #1 in SF bug 1342 --- bochs/config.h.in | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/bochs/config.h.in b/bochs/config.h.in index 3cffc78bd..e550177b7 100644 --- a/bochs/config.h.in +++ b/bochs/config.h.in @@ -567,12 +567,16 @@ typedef #define HAVE_SIGACTION 1 +#ifndef __cplusplus + // configure will change the definition of "inline" to the value // that the C compiler allows. It tests the following keywords to // see if any is permitted: inline, __inline__, __inline. If none // is permitted, it defines inline to be empty. #define inline inline +#endif + // Use BX_CPP_INLINE for all C++ inline functions. Note that the // word "inline" itself may now be redefined by the above #define. #define BX_CPP_INLINE inline