From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:33358) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5fQB-0001Lh-V7 for qemu-devel@nongnu.org; Thu, 08 Mar 2012 10:38:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S5fPl-0001ar-JY for qemu-devel@nongnu.org; Thu, 08 Mar 2012 10:38:27 -0500 Received: from e06smtp12.uk.ibm.com ([195.75.94.108]:48176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S5fPl-0001a4-AE for qemu-devel@nongnu.org; Thu, 08 Mar 2012 10:38:01 -0500 Received: from /spool/local by e06smtp12.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Mar 2012 15:37:56 -0000 Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by d06nrmr1806.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id q28Fbd7r2855118 for ; Thu, 8 Mar 2012 15:37:39 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id q28Fbd9k007074 for ; Thu, 8 Mar 2012 08:37:39 -0700 From: Stefan Hajnoczi Date: Thu, 8 Mar 2012 15:37:20 +0000 Message-Id: <1331221041-4710-11-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1331221041-4710-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1331221041-4710-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 10/11] osdep: Remove local definition of macro offsetof List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: Stefan Weil , qemu-devel@nongnu.org, Stefan Hajnoczi From: Stefan Weil 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 Signed-off-by: Stefan Hajnoczi --- configure | 14 -------------- osdep.h | 3 --- 2 files changed, 0 insertions(+), 17 deletions(-) diff --git a/configure b/configure index e19b6e3..ed3d907 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 -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 432b91e..0350383 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); \ -- 1.7.9.1