From c253b1d7bcee3836e970e2f73c7b680469b5024b Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Wed, 23 Nov 2016 21:33:54 +0000 Subject: [PATCH] [INCLUDES/WINE][DBGHELP] Remove the rbtree.h difference with Wine Staging 1.9.23. CORE-12409 svn path=/trunk/; revision=73367 --- reactos/sdk/include/host/wine/rbtree.h | 1 + reactos/sdk/include/reactos/wine/rbtree.h | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/reactos/sdk/include/host/wine/rbtree.h b/reactos/sdk/include/host/wine/rbtree.h index 86c376aa12c..d6b34a35712 100644 --- a/reactos/sdk/include/host/wine/rbtree.h +++ b/reactos/sdk/include/host/wine/rbtree.h @@ -1 +1,2 @@ +#include #include "../../reactos/wine/rbtree.h" diff --git a/reactos/sdk/include/reactos/wine/rbtree.h b/reactos/sdk/include/reactos/wine/rbtree.h index a8195493bfb..441e0393958 100644 --- a/reactos/sdk/include/reactos/wine/rbtree.h +++ b/reactos/sdk/include/reactos/wine/rbtree.h @@ -26,10 +26,10 @@ #ifdef __GNUC__ # define WINE_RB_ENTRY_VALUE(element, type, field) ({ \ const typeof(((type *)0)->field) *__ptr = (element); \ - (type *)((char *)__ptr - FIELD_OFFSET(type, field)); }) + (type *)((char *)__ptr - offsetof(type, field)); }) #else # define WINE_RB_ENTRY_VALUE(element, type, field) \ - ((type *)((char *)(element) - FIELD_OFFSET(type, field))) + ((type *)((char *)(element) - offsetof(type, field))) #endif struct wine_rb_entry