- move config.h before the extern "C" { } business so that I can use
BX_WITH_CARBON in there - don't include Carbon/Carbon.h. I assume it was in there just for the typedef Boolean
This commit is contained in:
parent
52c1b297e6
commit
6d5c174ec0
@ -30,6 +30,8 @@
|
||||
#ifndef BX_BOCHS_H
|
||||
# define BX_BOCHS_H 1
|
||||
|
||||
#include "config.h" /* generated by configure script from config.h.in */
|
||||
|
||||
extern "C" {
|
||||
#include <stdarg.h>
|
||||
#include <stdio.h>
|
||||
@ -45,7 +47,6 @@ extern "C" {
|
||||
# include <types.h>
|
||||
# include <stat.h>
|
||||
#elif BX_WITH_CARBON
|
||||
# include <Carbon/Carbon.h>
|
||||
# include <sys/types.h>
|
||||
# include <sys/stat.h>
|
||||
# include <sys/param.h> /* for MAXPATHLEN */
|
||||
@ -65,7 +66,6 @@ extern "C" {
|
||||
#endif
|
||||
}
|
||||
|
||||
#include "config.h" /* generated by configure script from config.h.in */
|
||||
#include "osdep.h" /* platform dependent includes and defines */
|
||||
#include "debug/debug.h"
|
||||
#include "bxversion.h"
|
||||
|
Loading…
x
Reference in New Issue
Block a user