aboutsummaryrefslogtreecommitdiffstats
path: root/osdep.h
diff options
context:
space:
mode:
authorDavid Turner <digit@android.com>2010-09-10 10:59:22 +0200
committerDavid 'Digit' Turner <digit@android.com>2010-09-13 00:30:34 -0700
commitf7dd220a26b2c2153e3b331b06826934cac292fb (patch)
tree7423210bdae14171c1d17f8df09d0cbebfaee945 /osdep.h
parentd06599430ac907d1a89bbfda4bf3621f909aac8e (diff)
downloadexternal_qemu-f7dd220a26b2c2153e3b331b06826934cac292fb.zip
external_qemu-f7dd220a26b2c2153e3b331b06826934cac292fb.tar.gz
external_qemu-f7dd220a26b2c2153e3b331b06826934cac292fb.tar.bz2
upstream: osdep updates.
+ add CONFIG_ANDROID to config-host.h
Diffstat (limited to 'osdep.h')
-rw-r--r--osdep.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/osdep.h b/osdep.h
index 0252217..1cdc7e2 100644
--- a/osdep.h
+++ b/osdep.h
@@ -28,7 +28,7 @@
#define unlikely(x) __builtin_expect(!!(x), 0)
#endif
-#ifndef offsetof
+#ifdef CONFIG_NEED_OFFSETOF
#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER)
#endif
#ifndef container_of
@@ -95,6 +95,8 @@ int qemu_create_pidfile(const char *filename);
#ifdef _WIN32
int ffs(int i);
+int setenv(const char *name, const char *value, int overwrite);
+
typedef struct {
long tv_sec;
long tv_usec;