diff options
| author | Stefan Weil <sw@weilnetz.de> | 2012-03-05 07:22:31 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@linux.vnet.ibm.com> | 2012-03-08 15:22:12 +0000 |
| commit | 82246040eaaeec8c53e87b2beff5488f6078bf35 (patch) | |
| tree | 9fa9e550bddbf056b37c29f1e8e30e502a9cb829 | |
| parent | 4a84ebe6a6b64c823e33876e3cda3c0813b2e1bb (diff) | |
| download | focaccia-qemu-82246040eaaeec8c53e87b2beff5488f6078bf35.tar.gz focaccia-qemu-82246040eaaeec8c53e87b2beff5488f6078bf35.zip | |
osdep: Remove local definition of macro offsetof
The macro offsetof is defined in stddef.h. It is conforming to the standards C89, C99 and POSIX.1-2001 (see man page), so it is a sufficiently old standard. Therefore chances are very high that QEMU never needs a local definition of this macro. osdep.h already includes stddef.h, so this patch simply removes the unneeded code from the files configure and osdep.h. If we ever need the local definition again, it should be added to compiler.h (the macro is usually provided with the compiler, it is not OS specific). Signed-off-by: Stefan Weil <sw@weilnetz.de> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
| -rwxr-xr-x | configure | 14 | ||||
| -rw-r--r-- | osdep.h | 3 |
2 files changed, 0 insertions, 17 deletions
diff --git a/configure b/configure index e19b6e3b5d..ed3d907911 100755 --- a/configure +++ b/configure @@ -2524,17 +2524,6 @@ if test "$darwin" != "yes" -a "$mingw32" != "yes" -a "$solaris" != yes -a \ fi ########################################## -# check if the compiler defines offsetof - -need_offsetof=yes -cat > $TMPC << EOF -#include <stddef.h> -int main(void) { struct s { int f; }; return offsetof(struct s, f); } -EOF -if compile_prog "" "" ; then - need_offsetof=no -fi - # spice probe if test "$spice" != "no" ; then cat > $TMPC << EOF @@ -3199,9 +3188,6 @@ fi if test "$tcg_interpreter" = "yes" ; then echo "CONFIG_TCG_INTERPRETER=y" >> $config_host_mak fi -if test "$need_offsetof" = "yes" ; then - echo "CONFIG_NEED_OFFSETOF=y" >> $config_host_mak -fi if test "$fdatasync" = "yes" ; then echo "CONFIG_FDATASYNC=y" >> $config_host_mak fi diff --git a/osdep.h b/osdep.h index 432b91ea72..0350383711 100644 --- a/osdep.h +++ b/osdep.h @@ -26,9 +26,6 @@ #define unlikely(x) __builtin_expect(!!(x), 0) #endif -#ifdef CONFIG_NEED_OFFSETOF -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *) 0)->MEMBER) -#endif #ifndef container_of #define container_of(ptr, type, member) ({ \ const typeof(((type *) 0)->member) *__mptr = (ptr); \ |