https://git.reactos.org/?p=reactos.git;a=commitdiff;h=45b55dc9b2c62689862ddc1a7dd8775cb184c7a6
commit 45b55dc9b2c62689862ddc1a7dd8775cb184c7a6 Author: winesync <[email protected]> AuthorDate: Fri Sep 11 18:57:59 2020 +0200 Commit: Jérôme Gardou <[email protected]> CommitDate: Wed Sep 16 10:35:53 2020 +0200 [WINESYNC] dbghelp: Don't use system headers for ELF declarations. Signed-off-by: Jacek Caban <[email protected]> Signed-off-by: Alexandre Julliard <[email protected]> wine commit id b664ae8e60e08224cdc3025c28a37cb22356aaa4 by Jacek Caban <[email protected]> --- dll/win32/dbghelp/elf_module.c | 6 +----- dll/win32/dbghelp/image_private.h | 17 ----------------- sdk/tools/winesync/dbghelp.cfg | 2 +- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c index ae25170bfc0..23cb8a54b70 100644 --- a/dll/win32/dbghelp/elf_module.c +++ b/dll/win32/dbghelp/elf_module.c @@ -24,9 +24,6 @@ #if defined(__svr4__) || defined(__sun) #define __ELF__ 1 -/* large files are not supported by libelf */ -#undef _FILE_OFFSET_BITS -#define _FILE_OFFSET_BITS 32 #endif #include <assert.h> @@ -34,9 +31,8 @@ #include <stdlib.h> #include "dbghelp_private.h" -#include "winternl.h" - #include "image_private.h" +#include "winternl.h" #include "wine/debug.h" #include "wine/heap.h" diff --git a/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h index d440461cc14..5da4c1e113e 100644 --- a/dll/win32/dbghelp/image_private.h +++ b/dll/win32/dbghelp/image_private.h @@ -21,23 +21,6 @@ #pragma once -#ifdef HAVE_ELF_H -# include <elf.h> -#endif -#ifdef HAVE_SYS_ELF32_H -# include <sys/elf32.h> -#endif -#ifdef HAVE_SYS_EXEC_ELF_H -# include <sys/exec_elf.h> -#endif -#if !defined(DT_NUM) -# if defined(DT_COUNT) -# define DT_NUM DT_COUNT -# else -/* this seems to be a satisfactory value on Solaris, which doesn't support this AFAICT */ -# define DT_NUM 24 -# endif -#endif #ifdef HAVE_LINK_H # include <link.h> #endif diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg index 0d9e9b6d711..a9c29f900c8 100644 --- a/sdk/tools/winesync/dbghelp.cfg +++ b/sdk/tools/winesync/dbghelp.cfg @@ -4,4 +4,4 @@ files: include/dbghelp.h: sdk/include/psdk/dbghelp.h include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h tags: - wine: 56f2b950c3a090d1951edd687e1c6e9ed9388732 + wine: b664ae8e60e08224cdc3025c28a37cb22356aaa4
