Alexandre Julliard : configure: Rename the shared heap segment to avoid a Mac OS linker bug with 16-char names .
Alexandre Julliard
julliard at winehq.org
Wed Jun 24 09:22:54 CDT 2009
Module: wine
Branch: master
Commit: 691bdbd12396678ef25e342333a3112d40a264f6
URL: http://source.winehq.org/git/wine.git/?a=commit;h=691bdbd12396678ef25e342333a3112d40a264f6
Author: Alexandre Julliard <julliard at winehq.org>
Date: Tue Jun 23 20:51:37 2009 +0200
configure: Rename the shared heap segment to avoid a Mac OS linker bug with 16-char names.
---
configure | 2 +-
configure.ac | 2 +-
loader/main.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 2d40991..2b759b7 100755
--- a/configure
+++ b/configure
@@ -7274,7 +7274,7 @@ fi
IOKITLIB="-framework IOKit -framework CoreFoundation"
- LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"
+ LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
then
diff --git a/configure.ac b/configure.ac
index 7f15375..eb276b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -580,7 +580,7 @@ case $host_os in
AC_SUBST(SECURITYLIB,"-framework Security -framework CoreFoundation")
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
- AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHARED_HEAP,0x7f000000"])
+ AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00000000,-segaddr,WINE_SHAREDHEAP,0x7f000000"])
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
then
dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found
diff --git a/loader/main.c b/loader/main.c
index c3189ec..0ead6d4 100644
--- a/loader/main.c
+++ b/loader/main.c
@@ -41,7 +41,7 @@
#ifdef __APPLE__
asm(".zerofill WINE_DOS, WINE_DOS, ___wine_dos, 0x60000000");
-asm(".zerofill WINE_SHARED_HEAP, WINE_SHARED_HEAP, ___wine_shared_heap, 0x03000000");
+asm(".zerofill WINE_SHAREDHEAP, WINE_SHAREDHEAP, ___wine_shared_heap, 0x03000000");
extern char __wine_dos[0x60000000], __wine_shared_heap[0x03000000];
static const struct wine_preload_info wine_main_preload_info[] =
More information about the wine-cvs
mailing list