Rename _BSD to HOST_BSD so that it's more obvious that it's defined by configure
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6775 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
parent
d5575a38b6
commit
179a2c1971
@ -750,7 +750,7 @@ static int64_t raw_getlength(BlockDriverState *bs)
|
||||
BDRVRawState *s = bs->opaque;
|
||||
int fd = s->fd;
|
||||
int64_t size;
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
struct stat sb;
|
||||
#endif
|
||||
#ifdef __sun__
|
||||
@ -763,7 +763,7 @@ static int64_t raw_getlength(BlockDriverState *bs)
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
if (!fstat(fd, &sb) && (S_IFCHR & sb.st_mode)) {
|
||||
#ifdef DIOCGMEDIASIZE
|
||||
if (ioctl(fd, DIOCGMEDIASIZE, (off_t *)&size))
|
||||
|
4
block.c
4
block.c
@ -22,7 +22,7 @@
|
||||
* THE SOFTWARE.
|
||||
*/
|
||||
#include "config-host.h"
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
/* include native header before sys-queue.h */
|
||||
#include <sys/queue.h>
|
||||
#endif
|
||||
@ -31,7 +31,7 @@
|
||||
#include "monitor.h"
|
||||
#include "block_int.h"
|
||||
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/ioctl.h>
|
||||
|
2
configure
vendored
2
configure
vendored
@ -1520,7 +1520,7 @@ fi
|
||||
if [ "$bsd" = "yes" ] ; then
|
||||
echo "#define O_LARGEFILE 0" >> $config_h
|
||||
echo "#define MAP_ANONYMOUS MAP_ANON" >> $config_h
|
||||
echo "#define _BSD 1" >> $config_h
|
||||
echo "#define HOST_BSD 1" >> $config_h
|
||||
fi
|
||||
|
||||
echo "#define CONFIG_UNAME_RELEASE \"$uname_release\"" >> $config_h
|
||||
|
@ -82,7 +82,7 @@ typedef void * host_reg_t;
|
||||
#define UINT32_MAX (4294967295U)
|
||||
#define UINT64_MAX ((uint64_t)(18446744073709551615))
|
||||
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
typedef struct __sFILE FILE;
|
||||
#else
|
||||
typedef struct FILE FILE;
|
||||
|
@ -6,7 +6,8 @@
|
||||
void set_float_rounding_mode(int val STATUS_PARAM)
|
||||
{
|
||||
STATUS(float_rounding_mode) = val;
|
||||
#if defined(_BSD) && !defined(__APPLE__) || (defined(HOST_SOLARIS) && HOST_SOLARIS < 10)
|
||||
#if defined(HOST_BSD) && !defined(__APPLE__) || \
|
||||
(defined(HOST_SOLARIS) && HOST_SOLARIS < 10)
|
||||
fpsetround(val);
|
||||
#elif defined(__arm__)
|
||||
/* nothing to do */
|
||||
@ -22,7 +23,7 @@ void set_floatx80_rounding_precision(int val STATUS_PARAM)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(_BSD) || (defined(HOST_SOLARIS) && HOST_SOLARIS < 10)
|
||||
#if defined(HOST_BSD) || (defined(HOST_SOLARIS) && HOST_SOLARIS < 10)
|
||||
#define lrint(d) ((int32_t)rint(d))
|
||||
#define llrint(d) ((int64_t)rint(d))
|
||||
#define lrintf(f) ((int32_t)rint(f))
|
||||
|
@ -1,7 +1,7 @@
|
||||
/* Native implementation of soft float functions */
|
||||
#include <math.h>
|
||||
|
||||
#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
|
||||
#if (defined(HOST_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
|
||||
#include <ieeefp.h>
|
||||
#define fabsf(f) ((float)fabs(f))
|
||||
#else
|
||||
@ -111,7 +111,7 @@ typedef union {
|
||||
/*----------------------------------------------------------------------------
|
||||
| Software IEC/IEEE floating-point rounding mode.
|
||||
*----------------------------------------------------------------------------*/
|
||||
#if (defined(_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
|
||||
#if (defined(HOST_BSD) && !defined(__APPLE__)) || defined(HOST_SOLARIS)
|
||||
#if defined(__OpenBSD__)
|
||||
#define FE_RM FP_RM
|
||||
#define FE_RP FP_RP
|
||||
|
6
net.c
6
net.c
@ -29,7 +29,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <zlib.h>
|
||||
|
||||
/* Needed early for _BSD etc. */
|
||||
/* Needed early for HOST_BSD etc. */
|
||||
#include "config-host.h"
|
||||
|
||||
#ifndef _WIN32
|
||||
@ -52,7 +52,7 @@
|
||||
#include <dirent.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/select.h>
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
#include <sys/stat.h>
|
||||
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
#include <libutil.h>
|
||||
@ -769,7 +769,7 @@ static TAPState *net_tap_fd_init(VLANState *vlan,
|
||||
return s;
|
||||
}
|
||||
|
||||
#if defined (_BSD) || defined (__FreeBSD_kernel__)
|
||||
#if defined (HOST_BSD) || defined (__FreeBSD_kernel__)
|
||||
static int tap_open(char *ifname, int ifname_size)
|
||||
{
|
||||
int fd;
|
||||
|
6
osdep.c
6
osdep.c
@ -33,13 +33,13 @@
|
||||
#include <sys/statvfs.h>
|
||||
#endif
|
||||
|
||||
/* Needed early for _BSD etc. */
|
||||
/* Needed early for HOST_BSD etc. */
|
||||
#include "config-host.h"
|
||||
|
||||
#ifdef _WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#elif defined(_BSD)
|
||||
#elif defined(HOST_BSD)
|
||||
#include <stdlib.h>
|
||||
#else
|
||||
#include <malloc.h>
|
||||
@ -188,7 +188,7 @@ void *qemu_memalign(size_t alignment, size_t size)
|
||||
if (ret != 0)
|
||||
return NULL;
|
||||
return ptr;
|
||||
#elif defined(_BSD)
|
||||
#elif defined(HOST_BSD)
|
||||
return valloc(size);
|
||||
#else
|
||||
return memalign(alignment, size);
|
||||
|
@ -61,7 +61,7 @@
|
||||
#include <dirent.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/select.h>
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
#include <sys/stat.h>
|
||||
#ifdef __FreeBSD__
|
||||
#include <libutil.h>
|
||||
|
4
savevm.c
4
savevm.c
@ -29,7 +29,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <zlib.h>
|
||||
|
||||
/* Needed early for _BSD etc. */
|
||||
/* Needed early for HOST_BSD etc. */
|
||||
#include "config-host.h"
|
||||
|
||||
#ifndef _WIN32
|
||||
@ -52,7 +52,7 @@
|
||||
#include <dirent.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/select.h>
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
#include <sys/stat.h>
|
||||
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
#include <libutil.h>
|
||||
|
4
vl.c
4
vl.c
@ -29,7 +29,7 @@
|
||||
#include <sys/time.h>
|
||||
#include <zlib.h>
|
||||
|
||||
/* Needed early for _BSD etc. */
|
||||
/* Needed early for HOST_BSD etc. */
|
||||
#include "config-host.h"
|
||||
|
||||
#ifndef _WIN32
|
||||
@ -53,7 +53,7 @@
|
||||
#include <dirent.h>
|
||||
#include <netdb.h>
|
||||
#include <sys/select.h>
|
||||
#ifdef _BSD
|
||||
#ifdef HOST_BSD
|
||||
#include <sys/stat.h>
|
||||
#if defined(__FreeBSD__) || defined(__DragonFly__)
|
||||
#include <libutil.h>
|
||||
|
Loading…
Reference in New Issue
Block a user