mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-10-05 22:05:47 +00:00
src: replace WSAStartup with g_networking_init()
g_networking_init() does the same as our custom code. Reviewed-by: Fabiano Fidêncio <fidencio@redhat.com> Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
parent
26d9748ff1
commit
f6a750e678
@ -24,7 +24,7 @@ AC_DEFUN([LIBVIRT_ARG_GLIB], [
|
|||||||
AC_DEFUN([LIBVIRT_CHECK_GLIB],[
|
AC_DEFUN([LIBVIRT_CHECK_GLIB],[
|
||||||
GLIB_REQUIRED=2.48.0
|
GLIB_REQUIRED=2.48.0
|
||||||
|
|
||||||
LIBVIRT_CHECK_PKG([GLIB], [glib-2.0 gobject-2.0], [$GLIB_REQUIRED])
|
LIBVIRT_CHECK_PKG([GLIB], [glib-2.0 gobject-2.0 gio-2.0], [$GLIB_REQUIRED])
|
||||||
|
|
||||||
if test "$with_glib" = "no" ; then
|
if test "$with_glib" = "no" ; then
|
||||||
AC_MSG_ERROR([glib-2.0, gobject-2.0 >= $GLIB_REQUIRED are required for libvirt])
|
AC_MSG_ERROR([glib-2.0, gobject-2.0 >= $GLIB_REQUIRED are required for libvirt])
|
||||||
|
@ -26,15 +26,12 @@
|
|||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <sys/wait.h>
|
#include <sys/wait.h>
|
||||||
#include <time.h>
|
#include <time.h>
|
||||||
|
#include <gio/gnetworking.h>
|
||||||
|
|
||||||
#include <libxml/parser.h>
|
#include <libxml/parser.h>
|
||||||
#include <libxml/xpath.h>
|
#include <libxml/xpath.h>
|
||||||
#include "getpass.h"
|
#include "getpass.h"
|
||||||
|
|
||||||
#ifdef HAVE_WINSOCK2_H
|
|
||||||
# include <winsock2.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef WITH_CURL
|
#ifdef WITH_CURL
|
||||||
# include <curl/curl.h>
|
# include <curl/curl.h>
|
||||||
#endif
|
#endif
|
||||||
@ -211,21 +208,6 @@ static virConnectAuth virConnectAuthDefault = {
|
|||||||
*/
|
*/
|
||||||
virConnectAuthPtr virConnectAuthPtrDefault = &virConnectAuthDefault;
|
virConnectAuthPtr virConnectAuthPtrDefault = &virConnectAuthDefault;
|
||||||
|
|
||||||
#if HAVE_WINSOCK2_H
|
|
||||||
static int
|
|
||||||
virWinsockInit(void)
|
|
||||||
{
|
|
||||||
WORD winsock_version, err;
|
|
||||||
WSADATA winsock_data;
|
|
||||||
|
|
||||||
/* http://msdn2.microsoft.com/en-us/library/ms742213.aspx */
|
|
||||||
winsock_version = MAKEWORD(2, 2);
|
|
||||||
err = WSAStartup(winsock_version, &winsock_data);
|
|
||||||
return err == 0 ? 0 : -1;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
static bool virGlobalError;
|
static bool virGlobalError;
|
||||||
static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER;
|
static virOnceControl virGlobalOnce = VIR_ONCE_CONTROL_INITIALIZER;
|
||||||
|
|
||||||
@ -261,10 +243,7 @@ virGlobalInit(void)
|
|||||||
|
|
||||||
VIR_DEBUG("register drivers");
|
VIR_DEBUG("register drivers");
|
||||||
|
|
||||||
#if HAVE_WINSOCK2_H
|
g_networking_init();
|
||||||
if (virWinsockInit() == -1)
|
|
||||||
goto error;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef HAVE_LIBINTL_H
|
#ifdef HAVE_LIBINTL_H
|
||||||
if (!bindtextdomain(PACKAGE, LOCALEDIR))
|
if (!bindtextdomain(PACKAGE, LOCALEDIR))
|
||||||
|
Loading…
Reference in New Issue
Block a user