Austin English : dbghelp: Fix compile on Hurd.

Alexandre Julliard julliard at winehq.org
Fri Oct 8 12:38:07 CDT 2010


Module: wine
Branch: master
Commit: 95740b30b9a76ee3de5353983159ad4cd71df2a1
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=95740b30b9a76ee3de5353983159ad4cd71df2a1

Author: Austin English <austinenglish at gmail.com>
Date:   Fri Oct  8 00:33:52 2010 -0700

dbghelp: Fix compile on Hurd.

---

 configure                   |    1 +
 configure.ac                |    1 +
 dlls/dbghelp/macho_module.c |    6 +++---
 include/config.h.in         |    3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index a735091..24deb97 100755
--- a/configure
+++ b/configure
@@ -5798,6 +5798,7 @@ for ac_header in \
 	linux/types.h \
 	linux/ucdrom.h \
 	mach-o/nlist.h \
+	mach-o/loader.h \
 	mach/mach.h \
 	mach/machine.h \
 	machine/cpu.h \
diff --git a/configure.ac b/configure.ac
index 1a502db..1c0ed46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -418,6 +418,7 @@ AC_CHECK_HEADERS(\
 	linux/types.h \
 	linux/ucdrom.h \
 	mach-o/nlist.h \
+	mach-o/loader.h \
 	mach/mach.h \
 	mach/machine.h \
 	machine/cpu.h \
diff --git a/dlls/dbghelp/macho_module.c b/dlls/dbghelp/macho_module.c
index 44fa4f2..9aac3e7 100644
--- a/dlls/dbghelp/macho_module.c
+++ b/dlls/dbghelp/macho_module.c
@@ -26,7 +26,7 @@
 
 #include "dbghelp_private.h"
 
-#ifdef __MACH__
+#ifdef HAVE_MACH_O_LOADER_H
 
 #include <assert.h>
 #include <stdarg.h>
@@ -1409,7 +1409,7 @@ struct module*  macho_load_module(struct process* pcs, const WCHAR* name, unsign
     return ml.macho_info.module;
 }
 
-#else   /* !__MACH__ */
+#else  /* HAVE_MACH_O_LOADER_H */
 
 BOOL    macho_synchronize_module_list(struct process* pcs)
 {
@@ -1441,4 +1441,4 @@ BOOL macho_load_debug_info(struct module* module, struct macho_file_map* fmap)
 {
     return FALSE;
 }
-#endif  /* __MACH__ */
+#endif  /* HAVE_MACH_O_LOADER_H */
diff --git a/include/config.h.in b/include/config.h.in
index 98a951f..0bb6be2 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -466,6 +466,9 @@
 /* Define to 1 if you have the <mach-o/dyld_images.h> header file. */
 #undef HAVE_MACH_O_DYLD_IMAGES_H
 
+/* Define to 1 if you have the <mach-o/loader.h> header file. */
+#undef HAVE_MACH_O_LOADER_H
+
 /* Define to 1 if you have the <mach-o/nlist.h> header file. */
 #undef HAVE_MACH_O_NLIST_H
 




More information about the wine-cvs mailing list