Upstream: HAVE_IOVEC => CONFIG_IOVEC
Change-Id: I18025d9c154a02af5d6298c7d7f72fc9f2c1c5d7
diff --git a/Makefile.android b/Makefile.android
index 598b430..86d8b42 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -209,7 +209,7 @@
ELFF_CFLAGS := -I$(LOCAL_PATH)/elff
-LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS)
+LOCAL_CFLAGS := $(MY_CFLAGS) $(LOCAL_CFLAGS) -fno-exceptions
LOCAL_CFLAGS += -I$(LOCAL_PATH)/target-arm -I$(LOCAL_PATH)/fpu $(ELFF_CFLAGS)
LOCAL_CFLAGS += $(ZLIB_CFLAGS) -I$(LOCAL_PATH)/$(ZLIB_DIR)
diff --git a/android-configure.sh b/android-configure.sh
index 45c8120..7a23954 100755
--- a/android-configure.sh
+++ b/android-configure.sh
@@ -458,7 +458,7 @@
case $OS in
linux-*|darwin-*)
- echo "#define HAVE_IOVEC 1" >> $config_h
+ echo "#define CONFIG_IOVEC 1" >> $config_h
;;
esac
diff --git a/android/config/darwin-x86/config-host.h b/android/config/darwin-x86/config-host.h
index f72cf17..b25d8fe 100644
--- a/android/config/darwin-x86/config-host.h
+++ b/android/config/darwin-x86/config-host.h
@@ -9,7 +9,7 @@
#define QEMU_PKGVERSION "Android"
#define O_LARGEFILE 0
#define MAP_ANONYMOUS MAP_ANON
-#define HAVE_IOVEC 1
+#define CONFIG_IOVEC 1
#define CONFIG_BSD 1
#define CONFIG_SKINS 1
#define CONFIG_UNAME_RELEASE ""
diff --git a/android/config/linux-x86/config-host.h b/android/config/linux-x86/config-host.h
index 7e2ed201..a97d2c6 100644
--- a/android/config/linux-x86/config-host.h
+++ b/android/config/linux-x86/config-host.h
@@ -10,4 +10,4 @@
#define CONFIG_SKINS 1
#define CONFIG_UNAME_RELEASE ""
#define CONFIG_IOTHREAD 1
-#define HAVE_IOVEC 1
+#define CONFIG_IOVEC 1
diff --git a/qemu-common.h b/qemu-common.h
index 9983303..1416dfd 100644
--- a/qemu-common.h
+++ b/qemu-common.h
@@ -37,8 +37,8 @@
#define ENOMEDIUM ENODEV
#endif
-#ifndef HAVE_IOVEC
-#define HAVE_IOVEC
+#ifndef CONFIG_IOVEC
+#define CONFIG_IOVEC
struct iovec {
void *iov_base;
size_t iov_len;
