External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-29 17:33:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation against static libraries

Browse Source 
* src/Makefile.am src/util-lib.h: fix done with Jim to allow
  compilation of virsh with the static libraries.
Daniel
This commit is contained in:
Daniel Veillard 2008-02-25 13:55:56 +00:00
parent e497deb89e
commit 9b1cd481b8
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Feb 25 14:53:59 CET 2008 Daniel Veillard <veillard@redhat.com>
* src/Makefile.am src/util-lib.h: fix done with Jim to allow
compilation of virsh with the static libraries.
Mon Feb 25 10:59:43 CET 2008 Jim Meyering <meyering@redhat.com> Mon Feb 25 10:59:43 CET 2008 Jim Meyering <meyering@redhat.com>
Avoid new "make syntax-check" failures. Avoid new "make syntax-check" failures.

2
src/Makefile.am
View File

@ -96,7 +96,7 @@ libvirt_la_LDFLAGS = -Wl,--version-script=$(srcdir)/libvirt_sym.version \
-version-info @LIBVIRT_VERSION_INFO@ \ -version-info @LIBVIRT_VERSION_INFO@ \
$(COVERAGE_CFLAGS:-f%=-Wc,-f%) \ $(COVERAGE_CFLAGS:-f%=-Wc,-f%) \
@CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@ @CYGWIN_EXTRA_LDFLAGS@ @MINGW_EXTRA_LDFLAGS@
libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) libvirt_la_CFLAGS = $(COVERAGE_CFLAGS) -DIN_LIBVIRT
bin_PROGRAMS = virsh bin_PROGRAMS = virsh

9
src/util-lib.h
View File

@ -10,6 +10,15 @@
#include <sys/types.h> #include <sys/types.h>
/*
* To avoid a double definition of the function when compiling
* programs using both util-lib and libvirt, like virsh
*/
#ifdef IN_LIBVIRT
#define saferead libvirt_saferead
#define safewrite libvirt_safewrite
#endif
int saferead(int fd, void *buf, size_t count); int saferead(int fd, void *buf, size_t count);
ssize_t safewrite(int fd, const void *buf, size_t count); ssize_t safewrite(int fd, const void *buf, size_t count);