diff options
| author | David 'Digit' Turner <digit@google.com> | 2010-01-27 18:18:41 -0800 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-05-11 17:35:34 -0700 |
| commit | 3d66dc7c08acb3802bf803abca68ac5fb36582b4 (patch) | |
| tree | 4587a38e638bbc48dabdd4a233eed4252953c16e | |
| parent | 2910f183ddd5286911bc1e3499ea93cb57de8b75 (diff) | |
| download | external_qemu-3d66dc7c08acb3802bf803abca68ac5fb36582b4.zip external_qemu-3d66dc7c08acb3802bf803abca68ac5fb36582b4.tar.gz external_qemu-3d66dc7c08acb3802bf803abca68ac5fb36582b4.tar.bz2 | |
Upstream: HAVE_IOVEC => CONFIG_IOVEC
Change-Id: I18025d9c154a02af5d6298c7d7f72fc9f2c1c5d7
| -rw-r--r-- | Makefile.android | 2 | ||||
| -rwxr-xr-x | android-configure.sh | 2 | ||||
| -rw-r--r-- | android/config/darwin-x86/config-host.h | 2 | ||||
| -rw-r--r-- | android/config/linux-x86/config-host.h | 2 | ||||
| -rw-r--r-- | qemu-common.h | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/Makefile.android b/Makefile.android index 598b430..86d8b42 100644 --- a/Makefile.android +++ b/Makefile.android @@ -209,7 +209,7 @@ LOCAL_CPP_EXTENSION := .cc 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 @@ fi 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 7e2ed20..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; |