christoph/fail
1
Fork 0
Code Releases Activity

bochs: fix ac++-caused preprocessor namespace clash

Browse Source 
When building with an experiment activated, the generated
instantiate-<experimentname>.ah gets included in each and every FAIL*
translation unit including Bochs's ones.  In the case of the
generic-experiment (and probably many others), this indirectly included
Google protobuf headers, which failed to compile for Bochs's gui/wx.cc and
gui/x.cc: The included X headers pollute the preprocessor namespace by
an internal protobuf "Status" class.

Change-Id: I613f5c792a9519cf2573eddc7fef6266c7168494
This commit is contained in:
Horst Schirmeier
2018-05-03 16:26:13 +02:00
parent 6f41ad73d3
commit 5a5a99145c
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
simulators/bochs/gui/wx.cc
View File

@ -1706,3 +1706,5 @@ static Bit32u convertStringToGDKKey (const char *string)
#endif #endif
#endif /* if BX_WITH_WX */ #endif /* if BX_WITH_WX */
#undef Status

2
simulators/bochs/gui/x.cc
View File

@ -2624,3 +2624,5 @@ BxEvent *x11_notify_callback (void *unused, BxEvent *event)
} }
#endif /* if BX_WITH_X11 */ #endif /* if BX_WITH_X11 */
#undef Status