提交 51ee43aa 编写于 作者: E Eric Blake

build: fix PROBE() usage of intptr_t

Otherwise, in locations like virobject.c where PROBE is used,
for certain configure options, the compiler warns:

util/virobject.c:110:1: error: 'intptr_t' undeclared (first use in this function)

As long as we are making this header always available, we can
clean up several other files.

* src/internal.h (includes): Pull in <stdint.h>.
* src/conf/nwfilter_conf.h: Rely on internal.h.
* src/storage/storage_backend.c: Likewise.
* src/storage/storage_backend.h: Likewise.
* src/util/cgroup.c: Likewise.
* src/util/sexpr.h: Likewise.
* src/util/virhashcode.h: Likewise.
* src/util/virnetdevvportprofile.h: Likewise.
* src/util/virnetlink.h: Likewise.
* src/util/virrandom.h: Likewise.
* src/vbox/vbox_driver.c: Likewise.
* src/xenapi/xenapi_driver.c: Likewise.
* src/xenapi/xenapi_utils.c: Likewise.
* src/xenapi/xenapi_utils.h: Likewise.
* src/xenxs/xenxs_private.h: Likewise.
* tests/storagebackendsheepdogtest.c: Likewise.
上级 7d7ee14b
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* nwfilter_conf.h: network filter XML processing * nwfilter_conf.h: network filter XML processing
* (derived from storage_conf.h) * (derived from storage_conf.h)
* *
* Copyright (C) 2006-2010 Red Hat, Inc. * Copyright (C) 2006-2010, 2012 Red Hat, Inc.
* Copyright (C) 2006-2008 Daniel P. Berrange * Copyright (C) 2006-2008 Daniel P. Berrange
* *
* Copyright (C) 2010 IBM Corporation * Copyright (C) 2010 IBM Corporation
...@@ -26,9 +26,6 @@ ...@@ -26,9 +26,6 @@
#ifndef NWFILTER_CONF_H #ifndef NWFILTER_CONF_H
# define NWFILTER_CONF_H # define NWFILTER_CONF_H
# include <stdint.h>
# include <stddef.h>
# include "internal.h" # include "internal.h"
# include "util.h" # include "util.h"
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
# include <limits.h> # include <limits.h>
# include <verify.h> # include <verify.h>
# include <stdbool.h> # include <stdbool.h>
# include <stdint.h>
# if STATIC_ANALYSIS # if STATIC_ANALYSIS
# undef NDEBUG /* Don't let a prior NDEBUG definition cause trouble. */ # undef NDEBUG /* Don't let a prior NDEBUG definition cause trouble. */
......
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
#include <sys/wait.h> #include <sys/wait.h>
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdint.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/param.h> #include <sys/param.h>
#include <dirent.h> #include <dirent.h>
......
/* /*
* storage_backend.h: internal storage driver backend contract * storage_backend.h: internal storage driver backend contract
* *
* Copyright (C) 2007-2010 Red Hat, Inc. * Copyright (C) 2007-2010, 2012 Red Hat, Inc.
* Copyright (C) 2007-2008 Daniel P. Berrange * Copyright (C) 2007-2008 Daniel P. Berrange
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#ifndef __VIR_STORAGE_BACKEND_H__ #ifndef __VIR_STORAGE_BACKEND_H__
# define __VIR_STORAGE_BACKEND_H__ # define __VIR_STORAGE_BACKEND_H__
# include <stdint.h>
# include "internal.h" # include "internal.h"
# include "storage_conf.h" # include "storage_conf.h"
# include "command.h" # include "command.h"
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <config.h> #include <config.h>
#include <stdio.h> #include <stdio.h>
#include <stdint.h>
#if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R #if defined HAVE_MNTENT_H && defined HAVE_GETMNTENT_R
# include <mntent.h> # include <mntent.h>
#endif #endif
......
/* /*
* sexpr.h : S-Expression interfaces needed to communicate with the Xen Daemon * sexpr.h : S-Expression interfaces needed to communicate with the Xen Daemon
* *
* Copyright (C) 2005 * Copyright (C) 2012 Red Hat, Inc.
* * Copyright (C) 2005 Anthony Liguori <aliguori@us.ibm.com>
* Anthony Liguori <aliguori@us.ibm.com>
* *
* This file is subject to the terms and conditions of the GNU Lesser General * This file is subject to the terms and conditions of the GNU Lesser General
* Public License. See the file COPYING.LIB in the main directory of this * Public License. See the file COPYING.LIB in the main directory of this
...@@ -16,9 +15,6 @@ ...@@ -16,9 +15,6 @@
# include "internal.h" # include "internal.h"
# include "buf.h" # include "buf.h"
# include <sys/types.h>
# include <stdint.h>
enum sexpr_type { enum sexpr_type {
SEXPR_NIL, SEXPR_NIL,
SEXPR_CONS, SEXPR_CONS,
......
...@@ -29,7 +29,6 @@ ...@@ -29,7 +29,6 @@
# define __VIR_HASH_CODE_H__ # define __VIR_HASH_CODE_H__
# include "internal.h" # include "internal.h"
# include <stdint.h>
extern uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed); extern uint32_t virHashCodeGen(const void *key, size_t len, uint32_t seed);
......
/* /*
* Copyright (C) 2009-2011 Red Hat, Inc. * Copyright (C) 2009-2012 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
...@@ -23,8 +23,6 @@ ...@@ -23,8 +23,6 @@
#ifndef __VIR_NETDEV_VPORT_PROFILE_H__ #ifndef __VIR_NETDEV_VPORT_PROFILE_H__
# define __VIR_NETDEV_VPORT_PROFILE_H__ # define __VIR_NETDEV_VPORT_PROFILE_H__
# include <stdint.h>
# include "internal.h" # include "internal.h"
# include "uuid.h" # include "uuid.h"
# include "util.h" # include "util.h"
......
...@@ -24,8 +24,6 @@ ...@@ -24,8 +24,6 @@
# include "internal.h" # include "internal.h"
# include "virmacaddr.h" # include "virmacaddr.h"
# include <stdint.h>
# if defined(__linux__) && defined(HAVE_LIBNL) # if defined(__linux__) && defined(HAVE_LIBNL)
# include <netlink/msg.h> # include <netlink/msg.h>
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
# define __VIR_RANDOM_H__ # define __VIR_RANDOM_H__
# include "internal.h" # include "internal.h"
# include <stdint.h>
uint64_t virRandomBits(int nbits); uint64_t virRandomBits(int nbits);
int virRandomGenerateWWN(char **wwn, const char *virt_type); int virRandomGenerateWWN(char **wwn, const char *virt_type);
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
*/ */
/* /*
* Copyright (C) 2010-2011 Red Hat, Inc. * Copyright (C) 2010-2012 Red Hat, Inc.
* Copyright (C) 2008-2009 Sun Microsystems, Inc. * Copyright (C) 2008-2009 Sun Microsystems, Inc.
* *
* This file is part of a free software library; you can redistribute * This file is part of a free software library; you can redistribute
...@@ -29,9 +29,7 @@ ...@@ -29,9 +29,7 @@
#include <config.h> #include <config.h>
#include <stdint.h>
#include <unistd.h> #include <unistd.h>
#include <sys/types.h>
#include "internal.h" #include "internal.h"
......
...@@ -23,7 +23,6 @@ ...@@ -23,7 +23,6 @@
#include <config.h> #include <config.h>
#include <limits.h> #include <limits.h>
#include <stdint.h>
#include <string.h> #include <string.h>
#include <curl/curl.h> #include <curl/curl.h>
#include <xen/api/xen_all.h> #include <xen/api/xen_all.h>
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <stdint.h>
#include <xen/api/xen_all.h> #include <xen/api/xen_all.h>
#include "internal.h" #include "internal.h"
#include "domain_conf.h" #include "domain_conf.h"
......
/* /*
* xenapi_utils.h: Xen API driver -- utils header * xenapi_utils.h: Xen API driver -- utils header
* Copyright (C) 2012, Red Hat, Inc.
* Copyright (C) 2009, 2010 Citrix Ltd. * Copyright (C) 2009, 2010 Citrix Ltd.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
...@@ -22,7 +23,6 @@ ...@@ -22,7 +23,6 @@
#ifndef __VIR_XENAPI_UTILS__ #ifndef __VIR_XENAPI_UTILS__
# define __VIR_XENAPI_UTILS__ # define __VIR_XENAPI_UTILS__
# include <stdint.h>
# include <xen/api/xen_all.h> # include <xen/api/xen_all.h>
# include "internal.h" # include "internal.h"
# include "viruri.h" # include "viruri.h"
......
/* /*
* xenxs_private.h: Private definitions for Xen parsing * xenxs_private.h: Private definitions for Xen parsing
* *
* Copyright (C) 2007, 2010, 2012 Red Hat, Inc.
* Copyright (C) 2011 Univention GmbH * Copyright (C) 2011 Univention GmbH
* Copyright (C) 2007, 2010 Red Hat, Inc.
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
# include "internal.h" # include "internal.h"
# include <stdint.h>
# include <xen/xen.h> # include <xen/xen.h>
# include "xen_sxpr.h" # include "xen_sxpr.h"
......
...@@ -25,10 +25,8 @@ ...@@ -25,10 +25,8 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <unistd.h> #include <unistd.h>
#include <stdint.h>
#include <string.h> #include <string.h>
#include <sys/types.h>
#include <fcntl.h> #include <fcntl.h>
#include "internal.h" #include "internal.h"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册