/[fink]/10.3/main/finkinfo/net/firefox1.5.patch
ViewVC logotype

Annotation of /10.3/main/finkinfo/net/firefox1.5.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.3 - (hide annotations) (download)
Tue Jul 10 15:23:48 2007 UTC (16 years, 10 months ago) by nieder
Branch: MAIN
CVS Tags: HEAD
Changes since 1.2: +1 -2 lines 
new 1.5.0.12 version
1 nieder 1.1 diff -ruN mozilla-orig/.mozconfig mozilla/.mozconfig
2 nieder 1.2 --- mozilla-orig/.mozconfig 1969-12-31 19:00:00.000000000 -0500
3     +++ mozilla/.mozconfig 2007-03-15 12:41:23.000000000 -0400
4 nieder 1.3 @@ -0,0 +1,42 @@
5 nieder 1.1 +# sh
6     +# Build configuration script
7     +#
8     +# See http://www.mozilla.org/build/unix.html for build instructions.
9     +#
10     +
11     +. $topsrcdir/browser/config/mozconfig
12     +
13     +# Options for client.mk.
14     +# environment variables to set
15     +#mk_add_options MOZILLA_OFFICIAL=1
16     +
17     +# Options for 'configure' (same as command-line options).
18     +ac_add_options --enable-official-branding
19     +ac_add_options --enable-default-toolkit=gtk2
20     +ac_add_options --enable-xft
21     +#ac_add_options --disable-xft
22     +#ac_add_options --enable-freetype2
23     +ac_add_options --disable-freetype2
24     +ac_add_options --enable-postscript
25     +ac_add_options --enable-xinerama
26     +ac_add_options --with-pthreads
27     +ac_add_options --disable-gnomevfs
28     +ac_add_options --disable-gnomeui
29     +ac_add_options --enable-extensions=default,-gnomevfs,xforms,schema-validation
30     +ac_add_options --enable-canvas
31     +ac_add_options --enable-svg
32     +
33     +# prebinding disabled or otherwise don't get binary
34     +ac_add_options --disable-prebinding
35     +ac_add_options --disable-debug
36     +ac_add_options --disable-tests
37     +ac_add_options --enable-strip
38 nieder 1.2 +ac_add_options --enable-optimize='-O2'
39 nieder 1.1 +ac_add_options --enable-macos-target=10.3
40     +ac_add_options --with-default-mozilla-five-home=@PREFIX@/lib/firefox1.5
41     +ac_add_options --with-system-jpeg=@PREFIX@
42     +ac_add_options --with-system-png=@PREFIX@
43     +ac_add_options --with-freetype-prefix=@PREFIX@/lib/freetype219
44     +
45     +#ac_add_options --with-ft-prefix=@PREFIX@/lib/freetype2
46     +#ac_add_options --with-ft-exec-prefix=@PREFIX@/lib/freetype2/bin
47     diff -ruN mozilla-orig/browser/app/mozilla.in mozilla/browser/app/mozilla.in
48 nieder 1.2 --- mozilla-orig/browser/app/mozilla.in 2005-09-20 17:13:03.000000000 -0400
49     +++ mozilla/browser/app/mozilla.in 2007-03-15 12:41:23.000000000 -0400
50 nieder 1.1 @@ -99,7 +99,9 @@
51     # If not, then start resolving symlinks until we find run-mozilla.sh
52     found=0
53     progname="$0"
54     -curdir=`dirname "$progname"`
55     +#curdir=`dirname "$progname"`
56     +# looking in %p/bin, not %p/lib/firefox, so fixing to $moz_libdir
57     +curdir="$moz_libdir"
58     progbase=`basename "$progname"`
59     run_moz="$curdir/run-mozilla.sh"
60     if test -x "$run_moz"; then
61 nieder 1.2 @@ -140,10 +142,76 @@
62 nieder 1.1 debugging=0
63     MOZILLA_BIN="${progbase}-bin"
64    
65     +# The following is to check for a currently running instance.
66     +# This is taken almost verbatim from the Mozilla RPM package's launch script.
67     +MOZ_CLIENT_PROGRAM="$dist_bin/mozilla-xremote-client"
68     +check_running() {
69     + "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" 'ping()' 2>/dev/null >/dev/null
70     + RETURN_VAL=$?
71     + if [ $RETURN_VAL -eq 0 ]; then
72     + echo 1
73     + return 1
74     + else
75     + echo 0
76     + return 0
77     + fi
78     +}
79     +
80     if [ "$OSTYPE" = "beos" ]; then
81     mimeset -F "$MOZILLA_BIN"
82     fi
83 nieder 1.2
84 nieder 1.1 +ALREADY_RUNNING=`check_running`
85     +
86     +################################################################ Parse Arguments
87     +# If there's a command line argument but it doesn't begin with a -
88     +# it's probably a url. Try to send it to a running instance.
89     +_USE_EXIST=0
90     +_optOne="$1"
91     +case "${_optOne}" in
92     + -*)
93     + ;;
94     + *)
95     + _USE_EXIST=1
96     + ;;
97     +esac
98     +
99     +_optLast=
100     +for i in "$@"; do
101     + _optLast="${i}"
102     +done #last arg
103     +
104     +if [ `expr "${_optLast}" : '.*:/.*'` -eq 0 -a \( -f "${_optLast}" -o -d "${_optLast}" \) ]; then
105     + # Last argument seems to be a local file/directory
106     + # Check, if it is absolutely specified (ie. /home/foo/file vs. ./file)
107     + # If it is just "relatively" (./file) specified, make it absolutely
108     + [ `expr "${_optLast}" : '/.*'` -eq 0 ] && _optLast="file://`pwd`/${_optLast}"
109     +fi
110     +################################################################ Parse Arguments
111     +
112     +########################################################################### Main
113     +if [ $ALREADY_RUNNING -eq 1 ]; then
114     + # There's an instance already running. Use it.
115     + # Any command line args passed in?
116     + if [ $# -gt 0 ]; then
117     + # There were "some" command line args.
118     + if [ ${_USE_EXIST} -eq 1 ]; then
119     + # We should use an existing instance, as _USE_EXIST=$_USE_EXIST=-1
120     + _remote_cmd="openURL(${_optLast})"
121     + "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "${_remote_cmd}"
122     + unset _remote_cmd
123     + exit $?
124     + fi
125     + else
126     + # No command line args. Open new window/tab
127     + #exec "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
128     + "${run_moz}" "$MOZ_CLIENT_PROGRAM" -a "${progbase}" "xfeDoCommand(openBrowser)"
129     + exit $?
130     + fi
131     +fi
132     +# Default action - no running instance or _USE_EXIST (${_USE_EXIST}) ! -eq 1
133     +########################################################################### Main
134 nieder 1.2 +
135 nieder 1.1 pass_arg_count=0
136     while [ $# -gt $pass_arg_count ]
137 nieder 1.2 do
138 nieder 1.1 diff -ruN mozilla-orig/browser/components/build/Makefile.in mozilla/browser/components/build/Makefile.in
139 nieder 1.2 --- mozilla-orig/browser/components/build/Makefile.in 2005-06-22 22:25:04.000000000 -0400
140     +++ mozilla/browser/components/build/Makefile.in 2007-03-15 12:41:24.000000000 -0400
141 nieder 1.1 @@ -74,6 +74,12 @@
142     $(MOZ_COMPONENT_LIBS) \
143     $(NULL)
144    
145     +# fix for building on Mac/X11 (bug 257773)
146     +# dependencies for gkgfx
147     +ifeq ($(MOZ_WIDGET_TOOLKIT), gtk2)
148     +EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS)
149     +endif
150     +
151     # Need to link to CoreFoundation for Mac Migrators (PList reading code)
152     ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
153     EXTRA_DSO_LDOPTS += \
154     diff -ruN mozilla-orig/browser/locales/en-US/profile/bookmarks.html mozilla/browser/locales/en-US/profile/bookmarks.html
155 nieder 1.2 --- mozilla-orig/browser/locales/en-US/profile/bookmarks.html 2005-11-03 03:30:35.000000000 -0500
156     +++ mozilla/browser/locales/en-US/profile/bookmarks.html 2007-03-15 12:41:24.000000000 -0400
157 nieder 1.1 @@ -12,6 +12,7 @@
158     <DL><p>
159     <DT><A HREF="http://www.mozilla.com/products/firefox/central.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" LAST_CHARSET="ISO-8859-1" ID="rdf:#$GvPhC3">Getting Started</A>
160     <DT><A HREF="http://fxfeeds.mozilla.com/" LAST_MODIFIED="1094668003" FEEDURL="http://fxfeeds.mozilla.com/rss20.xml" ID="rdf:#$HvPhC3">Latest Headlines</A>
161     + <DT><A HREF="http://fink.sourceforge.net/">Fink - Home</A>
162     </DL><p>
163     <HR>
164     <DT><H3 ID="rdf:#$6wPhC3">Quick Searches</H3>
165     diff -ruN mozilla-orig/build/unix/mozilla-config.in mozilla/build/unix/mozilla-config.in
166 nieder 1.2 --- mozilla-orig/build/unix/mozilla-config.in 2004-04-22 16:17:59.000000000 -0400
167     +++ mozilla/build/unix/mozilla-config.in 2007-03-15 12:41:24.000000000 -0400
168 nieder 1.1 @@ -115,7 +115,7 @@
169     fi
170    
171     _nspr_libs="%FULL_NSPR_LIBS%"
172     -_xpcom_libs="-lxpcom $_nspr_libs"
173     +_xpcom_libs="-lxpcom -lxpcom_core $_nspr_libs"
174     _js_libs="-ljs"
175    
176     if test "$echo_libs" = "yes"; then
177     diff -ruN mozilla-orig/build/unix/mozilla-xpcom.pc.in mozilla/build/unix/mozilla-xpcom.pc.in
178 nieder 1.2 --- mozilla-orig/build/unix/mozilla-xpcom.pc.in 2005-07-05 19:21:52.000000000 -0400
179     +++ mozilla/build/unix/mozilla-xpcom.pc.in 2007-03-15 12:41:24.000000000 -0400
180 nieder 1.1 @@ -8,5 +8,5 @@
181     Description: The Mozilla Cross Platform Component Library
182     Version: %MOZILLA_VERSION%
183     Requires: %NSPR_NAME% >= %NSPR_VERSION%
184     -Libs: -L${libdir} -lxpcom
185     +Libs: -L${libdir} -lxpcom -lxpcom_core
186     Cflags: -I${includedir} -I${includedir}/xpcom -I${includedir}/string
187     diff -ruN mozilla-orig/config/autoconf.mk.in mozilla/config/autoconf.mk.in
188 nieder 1.2 --- mozilla-orig/config/autoconf.mk.in 2006-04-21 16:50:30.000000000 -0400
189     +++ mozilla/config/autoconf.mk.in 2007-03-15 12:41:24.000000000 -0400
190 nieder 1.1 @@ -56,14 +56,14 @@
191     prefix = @prefix@
192     exec_prefix = @exec_prefix@
193     bindir = @bindir@
194     -includedir = @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
195     +includedir = @includedir@/$(MOZ_APP_NAME)1.5
196     libdir = @libdir@
197     datadir = @datadir@
198     mandir = @mandir@
199     -idldir = @datadir@/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
200     +idldir = @datadir@/idl/$(MOZ_APP_NAME)1.5
201    
202     -mozappdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
203     -mredir = $(libdir)/mre/mre-$(MOZ_APP_VERSION)
204     +mozappdir = $(libdir)/$(MOZ_APP_NAME)1.5
205     +mredir = $(libdir)/mre/mre1.5
206     mrelibdir = $(mredir)/lib
207    
208     DIST = $(DEPTH)/dist
209     diff -ruN mozilla-orig/config/config.mk mozilla/config/config.mk
210 nieder 1.2 --- mozilla-orig/config/config.mk 2006-04-06 12:28:13.000000000 -0400
211     +++ mozilla/config/config.mk 2007-03-15 12:41:24.000000000 -0400
212 nieder 1.1 @@ -679,7 +679,7 @@
213     ifeq ($(OS_ARCH),Darwin)
214     ifdef USE_PREBINDING
215     export LD_PREBIND=1
216     -export LD_SEG_ADDR_TABLE=$(shell cd $(topsrcdir); pwd)/config/prebind-address-table
217     +export LD_PREBIND_ALLOW_OVERLAP=1
218     endif # USE_PREBINDING
219     ifdef NEXT_ROOT
220     export NEXT_ROOT
221     diff -ruN mozilla-orig/configure mozilla/configure
222 nieder 1.2 --- mozilla-orig/configure 2006-08-23 12:40:33.000000000 -0400
223     +++ mozilla/configure 2007-03-15 12:41:24.000000000 -0400
224     @@ -5516,7 +5516,7 @@
225 nieder 1.1 ;;
226    
227     *-darwin*)
228     - HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX -DXP_MACOSX -DNO_X11"
229     + HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX"
230     HOST_NSPR_MDCPUCFG='\"md/_darwin.cfg\"'
231     HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}"
232     MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(DIST)/bin'
233 nieder 1.2 @@ -5802,10 +5802,10 @@
234 nieder 1.1
235     *-darwin*)
236     _PEDANTIC=
237     - CFLAGS="$CFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
238     - CXXFLAGS="$CXXFLAGS -fpascal-strings -no-cpp-precomp -fno-common"
239     + CFLAGS="$CFLAGS -no-cpp-precomp -fno-common"
240     + CXXFLAGS="$CXXFLAGS -no-cpp-precomp -fno-common"
241     DLL_SUFFIX=".dylib"
242     - DSO_LDOPTS=''
243     + DSO_LDOPTS='-framework CoreFoundation'
244     STRIP="$STRIP -x -S"
245     _PLATFORM_DEFAULT_TOOLKIT='mac'
246     MOZ_ENABLE_POSTSCRIPT=
247     diff -ruN mozilla-orig/fink/applications/firefox.desktop mozilla/fink/applications/firefox.desktop
248 nieder 1.2 --- mozilla-orig/fink/applications/firefox.desktop 1969-12-31 19:00:00.000000000 -0500
249     +++ mozilla/fink/applications/firefox.desktop 2007-03-15 12:41:24.000000000 -0400
250 nieder 1.1 @@ -0,0 +1,10 @@
251     +[Desktop Entry]
252     +Encoding=UTF-8
253     +Name=Firefox Web Browser
254     +Comment=Browse the World Wide Web
255     +Exec=firefox
256     +Icon=firefox.xpm
257     +Terminal=false
258     +Type=Application
259     +Categories=Application;Network
260     +StartupNotify=true
261     diff -ruN mozilla-orig/fink/fink.js mozilla/fink/fink.js
262 nieder 1.2 --- mozilla-orig/fink/fink.js 1969-12-31 19:00:00.000000000 -0500
263     +++ mozilla/fink/fink.js 2007-03-15 12:41:24.000000000 -0400
264 nieder 1.1 @@ -0,0 +1,27 @@
265     +pref("general.useragent.extra.vendorComment", "Fink Community Edition");
266     +
267     +// Give a default font set that can do BOLD
268     +pref("font.name.serif.x-western", "Bitstream Vera Serif");
269     +pref("font.name.sans-serif.x-western", "Bitstream Vera Sans");
270     +pref("font.size.variable.x-western", 15);
271     +
272     +// TrueType
273     +//pref("font.FreeType2.enable", true);
274     +//pref("font.freetype2.shared-library", "@PREFIX@/lib/freetype219/lib/libfreetype.6.dylib");
275     +//pref("font.freetype2.shared-library", "/usr/X11R6/lib/libfreetype.6.dylib");
276     +//pref("font.freetype2.autohinted", true);
277     +//pref("font.freetype2.unhinted", true);
278     +//pref("font.antialias.min", 10);
279     +//pref("font.embedded_bitmaps.max", 1000000);
280     +//pref("font.scale.tt_bitmap.dark_text.min", 64);
281     +//pref("font.scale.tt_bitmap.dark_text.gain", "0.0");
282     +//pref("font.directory.truetype.1", "/Library/Fonts");
283     +//pref("font.directory.truetype.2", "/Network/Library/Fonts");
284     +//pref("font.directory.truetype.3", "/System/Library/Fonts");
285     +//pref("font.directory.truetype.4", "/usr/X11R6/lib/X11/fonts/TTF");
286     +//pref("font.directory.truetype.5", "@PREFIX@/share/fonts/truetype");
287     +
288     +// AA with Bitmap scaling.
289     +//pref("font.scale.aa_bitmap.enable", true);
290     +//pref("font.scale.aa_bitmap.always", false);
291     +//pref("font.scale.aa_bitmap.min", 6);
292     diff -ruN mozilla-orig/modules/libpref/src/nsPrefService.cpp mozilla/modules/libpref/src/nsPrefService.cpp
293 nieder 1.2 --- mozilla-orig/modules/libpref/src/nsPrefService.cpp 2005-05-13 20:30:08.000000000 -0400
294     +++ mozilla/modules/libpref/src/nsPrefService.cpp 2007-03-15 12:41:24.000000000 -0400
295 nieder 1.1 @@ -748,6 +748,7 @@
296     #elif defined(XP_BEOS)
297     "beos.js"
298     #endif
299     + , "fink.js"
300     };
301    
302     rv = pref_LoadPrefsInDir(defaultPrefDir, specialFiles, NS_ARRAY_LENGTH(specialFiles));
303     diff -ruN mozilla-orig/nsprpub/config/nspr.m4 mozilla/nsprpub/config/nspr.m4
304 nieder 1.2 --- mozilla-orig/nsprpub/config/nspr.m4 2001-05-11 20:36:57.000000000 -0400
305     +++ mozilla/nsprpub/config/nspr.m4 2007-03-15 12:41:24.000000000 -0400
306 nieder 1.1 @@ -5,7 +5,7 @@
307    
308     dnl AM_PATH_NSPR([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
309     dnl Test for NSPR, and define NSPR_CFLAGS and NSPR_LIBS
310     -AC_DEFUN(AM_PATH_NSPR,
311     +AC_DEFUN([AM_PATH_NSPR],
312     [dnl
313    
314     AC_ARG_WITH(nspr-prefix,
315     diff -ruN mozilla-orig/nsprpub/configure mozilla/nsprpub/configure
316 nieder 1.2 --- mozilla-orig/nsprpub/configure 2007-01-16 17:36:21.000000000 -0500
317     +++ mozilla/nsprpub/configure 2007-03-15 12:41:24.000000000 -0400
318 nieder 1.1 @@ -3338,9 +3338,6 @@
319    
320     # Add Mac OS X support for loading CFM & CFBundle plugins
321     if test -f /System/Library/Frameworks/Carbon.framework/Carbon; then
322     - cat >> confdefs.h <<\EOF
323     -#define XP_MACOSX 1
324     -EOF
325    
326     OS_TARGET=MacOSX
327    
328 nieder 1.2 @@ -4956,8 +4953,6 @@
329 nieder 1.1
330    
331     case $target in
332     -*-darwin*)
333     - ;;
334     *)
335     echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6
336 nieder 1.2 echo "configure:4964: checking for dlopen in -ldl" >&5
337 nieder 1.1 diff -ruN mozilla-orig/nsprpub/pr/include/md/_darwin.h mozilla/nsprpub/pr/include/md/_darwin.h
338 nieder 1.2 --- mozilla-orig/nsprpub/pr/include/md/_darwin.h 2006-12-06 13:02:35.000000000 -0500
339     +++ mozilla/nsprpub/pr/include/md/_darwin.h 2007-03-15 12:41:24.000000000 -0400
340 nieder 1.1 @@ -62,7 +62,8 @@
341    
342     #undef HAVE_STACK_GROWING_UP
343     #define HAVE_DLL
344     -#define USE_MACH_DYLD
345     +/* #define USE_MACH_DYLD */
346     +#define USE_DLFCN
347     #define _PR_HAVE_SOCKADDR_LEN
348     #define _PR_STAT_HAS_ST_ATIMESPEC
349 nieder 1.2 #define _PR_HAVE_LARGE_OFF_T
350 nieder 1.1 diff -ruN mozilla-orig/nsprpub/pr/src/Makefile.in mozilla/nsprpub/pr/src/Makefile.in
351 nieder 1.2 --- mozilla-orig/nsprpub/pr/src/Makefile.in 2006-10-18 20:39:28.000000000 -0400
352     +++ mozilla/nsprpub/pr/src/Makefile.in 2007-03-15 12:41:24.000000000 -0400
353 nieder 1.1 @@ -204,9 +204,9 @@
354     endif
355     endif
356    
357     -ifeq ($(OS_TARGET),MacOSX)
358     -OS_LIBS = -framework CoreServices -framework CoreFoundation
359     -endif
360     +#ifeq ($(OS_TARGET),MacOSX)
361     +#OS_LIBS = -framework CoreServices -framework CoreFoundation
362     +#endif
363    
364     ifdef GC_LEAK_DETECTOR
365     EXTRA_LIBS = -L$(dist_libdir) -lboehm
366     diff -ruN mozilla-orig/nsprpub/pr/src/linking/prlink.c mozilla/nsprpub/pr/src/linking/prlink.c
367 nieder 1.2 --- mozilla-orig/nsprpub/pr/src/linking/prlink.c 2006-10-06 19:36:22.000000000 -0400
368     +++ mozilla/nsprpub/pr/src/linking/prlink.c 2007-03-15 12:41:24.000000000 -0400
369     @@ -158,7 +158,8 @@
370 nieder 1.1 #if defined(SUNOS4) || defined(DARWIN) || defined(NEXTSTEP) \
371     || defined(WIN16) || defined(XP_OS2) \
372     || ((defined(OPENBSD) || defined(NETBSD)) && !defined(__ELF__))
373     -#define NEED_LEADING_UNDERSCORE
374     +/* On MacOSX 10.3, dlsym does not accept symbols with '_'. */
375     +/* #define NEED_LEADING_UNDERSCORE */
376     #endif
377    
378 nieder 1.2 #define PR_LD_PATHW 0x8000 /* for PR_LibSpec_PathnameU */
379 nieder 1.1 diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h
380 nieder 1.2 --- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2006-02-23 14:37:11.000000000 -0500
381     +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h 2007-03-15 12:41:25.000000000 -0400
382 nieder 1.1 @@ -163,7 +163,7 @@
383     /* Define KEEP_STACK_16_BYTE_ALIGNED if the stack needs to maintain alignment
384     * in a CALL for some good reason (like ABI compliance). */
385    
386     -#ifdef XP_MACOSX
387     +#ifdef __APPLE__
388     /* http://developer.apple.com/documentation/DeveloperTools/Conceptual/LowLevelABI/Articles/IA32.html */
389     #define KEEP_STACK_16_BYTE_ALIGNED
390     #endif
391     diff -ruN mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp
392 nieder 1.2 --- mozilla-orig/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp 2005-10-24 01:42:28.000000000 -0400
393     +++ mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp 2007-03-15 12:41:25.000000000 -0400
394 nieder 1.1 @@ -104,7 +104,7 @@
395    
396     #ifdef __GNUC__ /* Gnu Compiler. */
397    
398     -#ifdef XP_MACOSX
399     +#ifdef __APPLE__
400     /* Make sure the stack is 16-byte aligned. Do that by aligning to 16 bytes and
401     * then subtracting 4 so the three subsequent pushes result in a 16-byte aligned
402     * stack. */
  ViewVC Help
Powered by ViewVC 1.1.17