mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-12-22 13:45:38 +00:00
Unify int types handling in protocol files
Some of the protocol files already include handing of the missing int types such as xdr_uint64_t, some don't. To fix it everywhere, move out of the appropriate defines to the utils/virxdrdefs.h file and include it where needed. Signed-off-by: Roman Bogorodskiy <bogorodskiy@gmail.com>
This commit is contained in:
parent
91b423beb7
commit
2b6f6ad64b
@ -171,6 +171,7 @@ UTIL_SOURCES = \
|
||||
util/viruri.h util/viruri.c \
|
||||
util/virutil.c util/virutil.h \
|
||||
util/viruuid.c util/viruuid.h \
|
||||
util/virxdrdefs.h \
|
||||
util/virxml.c util/virxml.h \
|
||||
$(NULL)
|
||||
|
||||
|
@ -22,6 +22,8 @@
|
||||
* Author: Martin Kletzander <mkletzan@redhat.com>
|
||||
*/
|
||||
|
||||
%#include "virxdrdefs.h"
|
||||
|
||||
/*----- Data types. -----*/
|
||||
|
||||
/* Length of long, but not unbounded, strings.
|
||||
|
@ -4,24 +4,7 @@
|
||||
* the libvirt_lxc helper program.
|
||||
*/
|
||||
|
||||
/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
|
||||
* and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
|
||||
*/
|
||||
%#ifdef HAVE_XDR_U_INT64_T
|
||||
%# define xdr_uint64_t xdr_u_int64_t
|
||||
%#endif
|
||||
%#ifndef IXDR_PUT_INT32
|
||||
%# define IXDR_PUT_INT32 IXDR_PUT_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_GET_INT32
|
||||
%# define IXDR_GET_INT32 IXDR_GET_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_PUT_U_INT32
|
||||
%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_GET_U_INT32
|
||||
%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
|
||||
%#endif
|
||||
%#include "virxdrdefs.h"
|
||||
|
||||
enum virLXCMonitorExitStatus {
|
||||
VIR_LXC_MONITOR_EXIT_STATUS_ERROR,
|
||||
|
@ -38,27 +38,9 @@
|
||||
|
||||
%#include <libvirt/libvirt.h>
|
||||
%#include "internal.h"
|
||||
%#include "virxdrdefs.h"
|
||||
%#include <arpa/inet.h>
|
||||
|
||||
/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
|
||||
* and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
|
||||
*/
|
||||
%#ifdef HAVE_XDR_U_INT64_T
|
||||
%# define xdr_uint64_t xdr_u_int64_t
|
||||
%#endif
|
||||
%#ifndef IXDR_PUT_INT32
|
||||
%# define IXDR_PUT_INT32 IXDR_PUT_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_GET_INT32
|
||||
%# define IXDR_GET_INT32 IXDR_GET_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_PUT_U_INT32
|
||||
%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_GET_U_INT32
|
||||
%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
|
||||
%#endif
|
||||
|
||||
/*----- Data types. -----*/
|
||||
|
||||
/* Length of long, but not unbounded, strings.
|
||||
|
@ -21,27 +21,9 @@
|
||||
*/
|
||||
|
||||
%#include "internal.h"
|
||||
%#include "virxdrdefs.h"
|
||||
%#include <arpa/inet.h>
|
||||
|
||||
/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
|
||||
* and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
|
||||
*/
|
||||
%#ifdef HAVE_XDR_U_INT64_T
|
||||
%# define xdr_uint64_t xdr_u_int64_t
|
||||
%#endif
|
||||
%#ifndef IXDR_PUT_INT32
|
||||
%# define IXDR_PUT_INT32 IXDR_PUT_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_GET_INT32
|
||||
%# define IXDR_GET_INT32 IXDR_GET_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_PUT_U_INT32
|
||||
%# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
|
||||
%#endif
|
||||
%#ifndef IXDR_GET_U_INT32
|
||||
%# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
|
||||
%#endif
|
||||
|
||||
/*----- Data types. -----*/
|
||||
|
||||
/* Initial message size.
|
||||
|
43
src/util/virxdrdefs.h
Normal file
43
src/util/virxdrdefs.h
Normal file
@ -0,0 +1,43 @@
|
||||
/*
|
||||
* virxdrdefs.h
|
||||
*
|
||||
* Copyright (C) 2016 Red Hat, Inc.
|
||||
*
|
||||
* This library is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU Lesser General Public
|
||||
* License as published by the Free Software Foundation; either
|
||||
* version 2.1 of the License, or (at your option) any later version.
|
||||
*
|
||||
* This library is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
* Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public
|
||||
* License along with this library. If not, see
|
||||
* <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef __VIR_XDRDEFS_H__
|
||||
# define __VIR_XDRDEFS_H__
|
||||
|
||||
/* cygwin's xdr implementation defines xdr_u_int64_t instead of xdr_uint64_t
|
||||
* and lacks IXDR_PUT_INT32 and IXDR_GET_INT32
|
||||
*/
|
||||
# ifdef HAVE_XDR_U_INT64_T
|
||||
# define xdr_uint64_t xdr_u_int64_t
|
||||
# endif
|
||||
# ifndef IXDR_PUT_INT32
|
||||
# define IXDR_PUT_INT32 IXDR_PUT_LONG
|
||||
# endif
|
||||
# ifndef IXDR_GET_INT32
|
||||
# define IXDR_GET_INT32 IXDR_GET_LONG
|
||||
# endif
|
||||
# ifndef IXDR_PUT_U_INT32
|
||||
# define IXDR_PUT_U_INT32 IXDR_PUT_U_LONG
|
||||
# endif
|
||||
# ifndef IXDR_GET_U_INT32
|
||||
# define IXDR_GET_U_INT32 IXDR_GET_U_LONG
|
||||
# endif
|
||||
|
||||
#endif /* __VIR_XDRDEFS_H__ */
|
Loading…
Reference in New Issue
Block a user