External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-22 11:22:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix export of virConnectAuthPtrDefault for MinGW builds

Browse Source 
Use the __declspec(dllexport/dllimport) stuff to export the symbol,
otherwise accessing virConnectAuthPtrDefault triggers a segfault.
This commit is contained in:
Matthias Bolte 2010-03-16 23:54:22 +01:00
parent 460e7b6a94
commit 190aaa2627
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configure.ac
View File

@ -1732,6 +1732,7 @@ CYGWIN_EXTRA_LDFLAGS=
CYGWIN_EXTRA_LIBADD= CYGWIN_EXTRA_LIBADD=
CYGWIN_EXTRA_PYTHON_LIBADD= CYGWIN_EXTRA_PYTHON_LIBADD=
MINGW_EXTRA_LDFLAGS= MINGW_EXTRA_LDFLAGS=
WIN32_EXTRA_CFLAGS=
case "$host" in case "$host" in
*-*-cygwin*) *-*-cygwin*)
CYGWIN_EXTRA_LDFLAGS="-no-undefined" CYGWIN_EXTRA_LDFLAGS="-no-undefined"
@ -1744,10 +1745,20 @@ case "$host" in
MINGW_EXTRA_LDFLAGS="-no-undefined" MINGW_EXTRA_LDFLAGS="-no-undefined"
;; ;;
esac esac
case "$host" in
*-*-mingw* | *-*-cygwin* | *-*-msvc* )
# If the host is Windows, and shared libraries are disabled, we
# need to add -DLIBVIRT_STATIC to the CFLAGS for proper linking
if test "x$enable_shared" = "xno"; then
WIN32_EXTRA_CFLAGS="-DLIBVIRT_STATIC"
fi
;;
esac
AC_SUBST([CYGWIN_EXTRA_LDFLAGS]) AC_SUBST([CYGWIN_EXTRA_LDFLAGS])
AC_SUBST([CYGWIN_EXTRA_LIBADD]) AC_SUBST([CYGWIN_EXTRA_LIBADD])
AC_SUBST([CYGWIN_EXTRA_PYTHON_LIBADD]) AC_SUBST([CYGWIN_EXTRA_PYTHON_LIBADD])
AC_SUBST([MINGW_EXTRA_LDFLAGS]) AC_SUBST([MINGW_EXTRA_LDFLAGS])
AC_SUBST([WIN32_EXTRA_CFLAGS])
dnl Look for windres to build a Windows icon resource. dnl Look for windres to build a Windows icon resource.
AC_CHECK_TOOL([WINDRES], [windres], [no]) AC_CHECK_TOOL([WINDRES], [windres], [no])

1
docs/apibuild.py
View File

@ -28,6 +28,7 @@ ignored_words = {
"ATTRIBUTE_UNUSED": (0, "macro keyword"), "ATTRIBUTE_UNUSED": (0, "macro keyword"),
"ATTRIBUTE_SENTINEL": (0, "macro keyword"), "ATTRIBUTE_SENTINEL": (0, "macro keyword"),
"VIR_DEPRECATED": (0, "macro keyword"), "VIR_DEPRECATED": (0, "macro keyword"),
"VIR_EXPORT_VAR": (0, "macro keyword"),
"WINAPI": (0, "Windows keyword"), "WINAPI": (0, "Windows keyword"),
"__declspec": (3, "Windows keyword"), "__declspec": (3, "Windows keyword"),
"__stdcall": (0, "Windows keyword"), "__stdcall": (0, "Windows keyword"),

16
include/libvirt/libvirt.h.in
View File

@ -29,6 +29,20 @@ extern "C" {
# endif # endif
#endif /* VIR_DEPRECATED */ #endif /* VIR_DEPRECATED */
#ifdef WIN32
# ifdef LIBVIRT_STATIC
# define VIR_EXPORT_VAR extern
# else
# ifdef IN_LIBVIRT
# define VIR_EXPORT_VAR __declspec(dllexport)
# else
# define VIR_EXPORT_VAR __declspec(dllimport) extern
# endif
# endif
#else
# define VIR_EXPORT_VAR extern
#endif
/** /**
* virConnect: * virConnect:
* *
@ -499,7 +513,7 @@ struct _virConnectAuth {
typedef struct _virConnectAuth virConnectAuth; typedef struct _virConnectAuth virConnectAuth;
typedef virConnectAuth *virConnectAuthPtr; typedef virConnectAuth *virConnectAuthPtr;
extern virConnectAuthPtr virConnectAuthPtrDefault; VIR_EXPORT_VAR virConnectAuthPtr virConnectAuthPtrDefault;
/** /**
* VIR_UUID_BUFLEN: * VIR_UUID_BUFLEN:

4
src/Makefile.am
View File

@ -20,7 +20,9 @@ INCLUDES = \
-DLOCAL_STATE_DIR=\""$(localstatedir)"\" \ -DLOCAL_STATE_DIR=\""$(localstatedir)"\" \
-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ -DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(LOCK_CHECKING_CFLAGS) $(LOCK_CHECKING_CFLAGS) \
-DIN_LIBVIRT \
$(WIN32_EXTRA_CFLAGS)
EXTRA_DIST = $(conf_DATA) EXTRA_DIST = $(conf_DATA)