diff options
-rw-r--r-- | block.c | 4 | ||||
-rw-r--r-- | block/raw-posix.c | 4 | ||||
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | dyngen-exec.h | 2 | ||||
-rw-r--r-- | fpu/softfloat-native.c | 4 | ||||
-rw-r--r-- | fpu/softfloat-native.h | 4 | ||||
-rw-r--r-- | fpu/softfloat.h | 2 | ||||
-rw-r--r-- | net.c | 6 | ||||
-rw-r--r-- | osdep.c | 6 | ||||
-rw-r--r-- | qemu-char.c | 2 | ||||
-rw-r--r-- | savevm.c | 4 | ||||
-rw-r--r-- | vl.c | 4 |
12 files changed, 22 insertions, 22 deletions
@@ -22,7 +22,7 @@ * THE SOFTWARE. */ #include "config-host.h" -#ifdef HOST_BSD +#ifdef CONFIG_BSD /* include native header before sys-queue.h */ #include <sys/queue.h> #endif @@ -32,7 +32,7 @@ #include "block_int.h" #include "module.h" -#ifdef HOST_BSD +#ifdef CONFIG_BSD #include <sys/types.h> #include <sys/stat.h> #include <sys/ioctl.h> diff --git a/block/raw-posix.c b/block/raw-posix.c index 3e1a875..bdee07f 100644 --- a/block/raw-posix.c +++ b/block/raw-posix.c @@ -779,7 +779,7 @@ static int64_t raw_getlength(BlockDriverState *bs) BDRVRawState *s = bs->opaque; int fd = s->fd; int64_t size; -#ifdef HOST_BSD +#ifdef CONFIG_BSD struct stat sb; #ifdef __FreeBSD__ int reopened = 0; @@ -795,7 +795,7 @@ static int64_t raw_getlength(BlockDriverState *bs) if (ret < 0) return ret; -#ifdef HOST_BSD +#ifdef CONFIG_BSD #ifdef __FreeBSD__ again: #endif @@ -1747,7 +1747,7 @@ fi # XXX: suppress that if [ "$bsd" = "yes" ] ; then echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_host_h - echo "#define HOST_BSD 1" >> $config_host_h + echo "#define CONFIG_BSD 1" >> $config_host_h fi echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_host_h diff --git a/dyngen-exec.h b/dyngen-exec.h index c1072cd..18819e4 100644 --- a/dyngen-exec.h +++ b/dyngen-exec.h @@ -39,7 +39,7 @@ /* XXX: This may be wrong for 64-bit ILP32 hosts. */ typedef void * host_reg_t; -#ifdef HOST_BSD +#ifdef CONFIG_BSD typedef struct __sFILE FILE; #else typedef struct FILE FILE; diff --git a/fpu/softfloat-native.c b/fpu/softfloat-native.c index 9576984..4c70b6c 100644 --- a/fpu/softfloat-native.c +++ b/fpu/softfloat-native.c @@ -9,7 +9,7 @@ void set_float_rounding_mode(int val STATUS_PARAM) { STATUS(float_rounding_mode) = val; -#if defined(HOST_BSD) && !defined(__APPLE__) || \ +#if defined(CONFIG_BSD) && !defined(__APPLE__) || \ (defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10) fpsetround(val); #elif defined(__arm__) @@ -26,7 +26,7 @@ void set_floatx80_rounding_precision(int val STATUS_PARAM) } #endif -#if defined(HOST_BSD) || \ +#if defined(CONFIG_BSD) || \ (defined(CONFIG_SOLARIS) && CONFIG_SOLARIS_VERSION < 10) #define lrint(d) ((int32_t)rint(d)) #define llrint(d) ((int64_t)rint(d)) diff --git a/fpu/softfloat-native.h b/fpu/softfloat-native.h index 839e5b1..0bba084 100644 --- a/fpu/softfloat-native.h +++ b/fpu/softfloat-native.h @@ -1,7 +1,7 @@ /* Native implementation of soft float functions */ #include <math.h> -#if (defined(HOST_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) +#if (defined(CONFIG_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) #include <ieeefp.h> #define fabsf(f) ((float)fabs(f)) #else @@ -112,7 +112,7 @@ typedef union { /*---------------------------------------------------------------------------- | Software IEC/IEEE floating-point rounding mode. *----------------------------------------------------------------------------*/ -#if (defined(HOST_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) +#if (defined(CONFIG_BSD) && !defined(__APPLE__)) || defined(CONFIG_SOLARIS) #if defined(__OpenBSD__) #define FE_RM FP_RM #define FE_RP FP_RP diff --git a/fpu/softfloat.h b/fpu/softfloat.h index b9537c1..f262150 100644 --- a/fpu/softfloat.h +++ b/fpu/softfloat.h @@ -90,7 +90,7 @@ typedef int64_t sbits64; #define FLOAT128 #else /* native float support */ -#if (defined(__i386__) || defined(__x86_64__)) && !defined(HOST_BSD) +#if (defined(__i386__) || defined(__x86_64__)) && !defined(CONFIG_BSD) #define FLOATX80 #endif #endif /* !CONFIG_SOFTFLOAT */ @@ -29,7 +29,7 @@ #include <sys/time.h> #include <zlib.h> -/* Needed early for HOST_BSD etc. */ +/* Needed early for CONFIG_BSD etc. */ #include "config-host.h" #ifndef _WIN32 @@ -52,7 +52,7 @@ #include <dirent.h> #include <netdb.h> #include <sys/select.h> -#ifdef HOST_BSD +#ifdef CONFIG_BSD #include <sys/stat.h> #if defined(__FreeBSD__) || defined(__DragonFly__) #include <libutil.h> @@ -1435,7 +1435,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan, return s; } -#if defined (HOST_BSD) || defined (__FreeBSD_kernel__) +#if defined (CONFIG_BSD) || defined (__FreeBSD_kernel__) static int tap_open(char *ifname, int ifname_size) { int fd; @@ -36,12 +36,12 @@ /* FIXME: This file should be target independent. However it has kqemu hacks, so must be built for every target. */ -/* Needed early for HOST_BSD etc. */ +/* Needed early for CONFIG_BSD etc. */ #include "config-host.h" #ifdef _WIN32 #include <windows.h> -#elif defined(HOST_BSD) +#elif defined(CONFIG_BSD) #include <stdlib.h> #else #include <malloc.h> @@ -210,7 +210,7 @@ void *qemu_memalign(size_t alignment, size_t size) if (ret != 0) abort(); return ptr; -#elif defined(HOST_BSD) +#elif defined(CONFIG_BSD) return oom_check(valloc(size)); #else return oom_check(memalign(alignment, size)); diff --git a/qemu-char.c b/qemu-char.c index b42046d..6ec9059 100644 --- a/qemu-char.c +++ b/qemu-char.c @@ -61,7 +61,7 @@ #include <dirent.h> #include <netdb.h> #include <sys/select.h> -#ifdef HOST_BSD +#ifdef CONFIG_BSD #include <sys/stat.h> #ifdef __FreeBSD__ #include <libutil.h> @@ -29,7 +29,7 @@ #include <sys/time.h> #include <zlib.h> -/* Needed early for HOST_BSD etc. */ +/* Needed early for CONFIG_BSD etc. */ #include "config-host.h" #ifndef _WIN32 @@ -52,7 +52,7 @@ #include <dirent.h> #include <netdb.h> #include <sys/select.h> -#ifdef HOST_BSD +#ifdef CONFIG_BSD #include <sys/stat.h> #if defined(__FreeBSD__) || defined(__DragonFly__) #include <libutil.h> @@ -29,7 +29,7 @@ #include <sys/time.h> #include <zlib.h> -/* Needed early for HOST_BSD etc. */ +/* Needed early for CONFIG_BSD etc. */ #include "config-host.h" /* Needed early to override system queue definitions on BSD */ #include "sys-queue.h" @@ -56,7 +56,7 @@ #include <dirent.h> #include <netdb.h> #include <sys/select.h> -#ifdef HOST_BSD +#ifdef CONFIG_BSD #include <sys/stat.h> #if defined(__FreeBSD__) || defined(__DragonFly__) #include <libutil.h> |