From 709aa1261477c142fafaa693289dba36945a863f Mon Sep 17 00:00:00 2001
From: Blue Swirl <blauwirbel@gmail.com>
Date: Wed, 22 Sep 2010 17:33:03 +0000
Subject: [PATCH] mingw: Win2k support for getaddrinfo etc.

Windows 2000 misses support for getaddrinfo etc.

Add missing functions from gnulib.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 Makefile        |    6 +++---
 Makefile.objs   |    3 +++
 Makefile.target |    1 +
 configure       |    2 +-
 gnulib          |    2 +-
 5 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index fca1e7a..4e5cfa3 100644
--- a/Makefile
+++ b/Makefile
@@ -123,11 +123,11 @@ version-obj-$(CONFIG_WIN32) += version.o
 qemu-img.o: qemu-img-cmds.h
 qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS)
 
-qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
+qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(gnulib-obj-y)
 
-qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
+qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(gnulib-obj-y)
 
-qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
+qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y) $(gnulib-obj-y)
 
 qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
 	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")
diff --git a/Makefile.objs b/Makefile.objs
index bf32f8a..849224c 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -35,6 +35,9 @@ net-nested-$(CONFIG_SLIRP) += slirp.o
 net-nested-$(CONFIG_VDE) += vde.o
 net-obj-y += $(addprefix net/, $(net-nested-y))
 
+gnulib-nested-$(CONFIG_WIN32) += getaddrinfo.o inet_ntop.o
+gnulib-obj-y += $(addprefix gnulib/lib/, $(gnulib-nested-y))
+
 fsdev-nested-$(CONFIG_VIRTFS) = qemu-fsdev.o
 fsdev-obj-$(CONFIG_VIRTFS) += $(addprefix fsdev/, $(fsdev-nested-y))
 
diff --git a/Makefile.target b/Makefile.target
index a4e80b1..9faf254 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -307,6 +307,7 @@ obj-y += $(addprefix ../, $(common-obj-y))
 obj-y += $(addprefix ../libdis/, $(libdis-y))
 obj-y += $(libobj-y)
 obj-y += $(addprefix $(HWDIR)/, $(hw-obj-y))
+obj-y += $(addprefix ../, $(gnulib-obj-y))
 
 endif # CONFIG_SOFTMMU
 
diff --git a/configure b/configure
index 18db3df..124c5c0 100755
--- a/configure
+++ b/configure
@@ -2990,7 +2990,7 @@ done # for target in $targets
 # build tree in object directory if source path is different from current one
 if test "$source_path_used" = "yes" ; then
     DIRS="tests tests/cris slirp audio block net pc-bios/optionrom"
-    DIRS="$DIRS roms/seabios roms/vgabios"
+    DIRS="$DIRS roms/seabios roms/vgabios gnulib/lib"
     DIRS="$DIRS fsdev ui"
     FILES="Makefile tests/Makefile"
     FILES="$FILES tests/cris/Makefile tests/cris/.gdbinit"
diff --git a/gnulib b/gnulib
index cbd866a..697a93c 160000
--- a/gnulib
+++ b/gnulib
@@ -1 +1 @@
-Subproject commit cbd866a050ff5f9bcfbcab518ea0a9c449d8bee6
+Subproject commit 697a93c1d383f346fb1bead9ea47733ddda3ec7d
-- 
1.5.6.5