[prev in list] [next in list] [prev in thread] [next in thread] 

List:       wine-devel
Subject:    [PATCH 13/13] dbghelp: Don't use system headers for ELF declarations.
From:       Jacek Caban <jacek () codeweavers ! com>
Date:       2020-03-31 16:23:45
Message-ID: 0a8eda91-286b-7d2b-5e28-626541094bea () codeweavers ! com
[Download RAW message or body]

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
---
  configure.ac                 | 10 ----------
  dlls/dbghelp/elf_module.c    |  6 +-----
  dlls/dbghelp/image_private.h | 17 -----------------
  3 files changed, 1 insertion(+), 32 deletions(-)



["0013-dbghelp-Don-t-use-system-headers-for-ELF-declarations.txt" (text/x-patch)]

diff --git a/configure.ac b/configure.ac
index b05a0f540a..9bae6a5dda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -498,10 +498,8 @@ AC_CHECK_HEADERS(\
 	sys/attr.h \
 	sys/auxv.h \
 	sys/cdio.h \
-	sys/elf32.h \
 	sys/epoll.h \
 	sys/event.h \
-	sys/exec_elf.h \
 	sys/filio.h \
 	sys/ioctl.h \
 	sys/ipc.h \
@@ -2313,14 +2311,6 @@ AC_CHECK_TYPES([struct xinpgen],,,
 #include <netinet/in_pcb.h>
 #endif])
 
-AC_CHECK_TYPES([struct r_debug, struct link_map],,,
-[#ifdef HAVE_LINK_H
-#include <link.h>
-#endif
-#ifdef HAVE_SYS_LINK_H
-#include <sys/link.h>
-#endif])
-
 AC_CHECK_MEMBERS([struct ff_effect.direction],,,
 [#ifdef HAVE_LINUX_INPUT_H
 #include <linux/input.h>
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index ae25170bfc..23cb8a54b7 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/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/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h
index 8c6f463ecb..2b414b9607 100644
--- a/dlls/dbghelp/image_private.h
+++ b/dlls/dbghelp/image_private.h
@@ -19,23 +19,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#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



[prev in list] [next in list] [prev in thread] [next in thread]