From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pa0-f44.google.com ([209.85.220.44]:49982 "EHLO mail-pa0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750826Ab3FZEOr (ORCPT ); Wed, 26 Jun 2013 00:14:47 -0400 Received: by mail-pa0-f44.google.com with SMTP id lj1so13647249pab.17 for ; Tue, 25 Jun 2013 21:14:47 -0700 (PDT) From: root To: linux-btrfs@vger.kernel.org Cc: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Subject: [PATCH btrfs-progs] kerncompat.h: remove offsetof redefinition Date: Wed, 26 Jun 2013 00:14:39 -0400 Message-Id: <1372220079-17236-1-git-send-email-root@xps9000.cristianrodriguez.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-btrfs-owner@vger.kernel.org List-ID: From: Cristian Rodríguez Must use the version provided by the compiler in stddef.h header --- kerncompat.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/kerncompat.h b/kerncompat.h index 9c116b4..6b4b4ba 100644 --- a/kerncompat.h +++ b/kerncompat.h @@ -26,6 +26,7 @@ #include #include #include +#include #ifndef READ #define READ 0 @@ -234,12 +235,6 @@ static inline long IS_ERR(const void *ptr) #define BUG_ON(c) assert(!(c)) #define WARN_ON(c) assert(!(c)) -#undef offsetof -#ifdef __compiler_offsetof -#define offsetof(TYPE,MEMBER) __compiler_offsetof(TYPE,MEMBER) -#else -#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER) -#endif #define container_of(ptr, type, member) ({ \ const typeof( ((type *)0)->member ) *__mptr = (ptr); \ -- 1.8.3.1