mirror of https://gitee.com/openkylin/libvirt.git
Fix build errors.
* proxy/Makefile.am (libvirt_proxy_LDADD): Add ../gnulib/lib/libgnu.la. * gnulib/lib/arpa_inet.in.h: Add new file from gnulib.
This commit is contained in:
parent
130426c659
commit
ffdc37c2aa
|
@ -1,5 +1,9 @@
|
|||
Tue Apr 29 21:43:28 CEST 2008 Jim Meyering <meyering@redhat.com>
|
||||
|
||||
Fix build errors.
|
||||
* proxy/Makefile.am (libvirt_proxy_LDADD): Add ../gnulib/lib/libgnu.la.
|
||||
* gnulib/lib/arpa_inet.in.h: Add new file from gnulib.
|
||||
|
||||
update from gnulib
|
||||
* gnulib/lib/inet_ntop.h: Remove file.
|
||||
* gnulib/m4/onceonly_2_57.m4: Remove file.
|
||||
|
|
|
@ -11,6 +11,7 @@ netinet_in.h
|
|||
poll.h
|
||||
stdbool.h
|
||||
stdint.h
|
||||
stdio-impl.h
|
||||
stdio.h
|
||||
stdlib.h
|
||||
string.h
|
||||
|
|
|
@ -0,0 +1,76 @@
|
|||
/* A GNU-like <arpa/inet.h>.
|
||||
|
||||
Copyright (C) 2005-2006, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This program is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
This program 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 General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program; if not, write to the Free Software Foundation,
|
||||
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
|
||||
|
||||
#ifndef _GL_ARPA_INET_H
|
||||
|
||||
/* Gnulib's sys/socket.h is responsible for pulling in winsock2.h etc
|
||||
under MinGW. */
|
||||
#include <sys/socket.h>
|
||||
|
||||
#if @HAVE_ARPA_INET_H@
|
||||
|
||||
/* The include_next requires a split double-inclusion guard. */
|
||||
# @INCLUDE_NEXT@ @NEXT_ARPA_INET_H@
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _GL_ARPA_INET_H
|
||||
#define _GL_ARPA_INET_H
|
||||
|
||||
#if @GNULIB_INET_NTOP@
|
||||
# if !@HAVE_DECL_INET_NTOP@
|
||||
/* Converts an internet address from internal format to a printable,
|
||||
presentable format.
|
||||
AF is an internet address family, such as AF_INET or AF_INET6.
|
||||
SRC points to a 'struct in_addr' (for AF_INET) or 'struct in6_addr'
|
||||
(for AF_INET6).
|
||||
DST points to a buffer having room for CNT bytes.
|
||||
The printable representation of the address (in numeric form, not
|
||||
surrounded by [...], no reverse DNS is done) is placed in DST, and
|
||||
DST is returned. If an error occurs, the return value is NULL and
|
||||
errno is set. If CNT bytes are not sufficient to hold the result,
|
||||
the return value is NULL and errno is set to ENOSPC. A good value
|
||||
for CNT is 46.
|
||||
|
||||
For more details, see the POSIX:2001 specification
|
||||
<http://www.opengroup.org/susv3xsh/inet_ntop.html>. */
|
||||
extern const char *inet_ntop (int af, const void *restrict src,
|
||||
char *restrict dst, socklen_t cnt);
|
||||
# endif
|
||||
#elif defined GNULIB_POSIXCHECK
|
||||
# undef inet_ntop
|
||||
# define inet_ntop(af,src,dst,cnt) \
|
||||
(GL_LINK_WARNING ("inet_ntop is unportable - " \
|
||||
"use gnulib module inet_ntop for portability"), \
|
||||
inet_ntop (af, src, dst, cnt))
|
||||
#endif
|
||||
|
||||
#if @GNULIB_INET_PTON@
|
||||
# if !@HAVE_DECL_INET_PTON@
|
||||
extern int inet_pton (int af, const char *restrict src, void *restrict dst);
|
||||
# endif
|
||||
#elif defined GNULIB_POSIXCHECK
|
||||
# undef inet_pton
|
||||
# define inet_pton(af,src,dst) \
|
||||
(GL_LINK_WARNING ("inet_pton is unportable - " \
|
||||
"use gnulib module inet_pton for portability"), \
|
||||
inet_pton (af, src, dst))
|
||||
#endif
|
||||
|
||||
#endif /* _GL_ARPA_INET_H */
|
||||
#endif /* _GL_ARPA_INET_H */
|
|
@ -24,3 +24,4 @@ test-unistd
|
|||
test-vasnprintf
|
||||
test-vasprintf
|
||||
test-wchar
|
||||
test-EOVERFLOW.c
|
||||
|
|
|
@ -19,7 +19,7 @@ libvirt_proxy_SOURCES = libvirt_proxy.c @top_srcdir@/src/xend_internal.c \
|
|||
@top_srcdir@/src/uuid.c
|
||||
libvirt_proxy_LDFLAGS = $(WARN_CFLAGS)
|
||||
libvirt_proxy_DEPENDENCIES =
|
||||
libvirt_proxy_LDADD =
|
||||
libvirt_proxy_LDADD = ../gnulib/lib/libgnu.la
|
||||
|
||||
install-exec-hook:
|
||||
chmod u+s $(DESTDIR)$(libexecdir)/libvirt_proxy
|
||||
|
|
Loading…
Reference in New Issue