diff -ruN php-4.3.3.orig/configure php-4.3.3/configure --- php-4.3.3.orig/configure Sun Aug 24 17:15:34 2003 +++ php-4.3.3/configure Thu Aug 28 21:30:26 2003 @@ -49319,7 +49319,6 @@ #line 49320 "configure" #include "confdefs.h" #include -int main() { int foo(int x, ...) { va_list va; @@ -49331,7 +49330,6 @@ } int main() { return foo(10, "", 3.14); } -; return 0; } EOF if { (eval echo configure:49337: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* @@ -83367,11 +83365,9 @@ # include #endif -int main() { int __tmp__() { mbstate_t a; } -; return 0; } EOF if { (eval echo configure:83377: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* @@ -95263,10 +95259,10 @@ # cross-compilation, but unfortunately the echo tests do not # yet detect zsh echo's removal of \ escapes. Also zsh mangles # `"' quotes if we put them in here... so don't! - archive_cmds='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' + archive_cmds='$nonopt -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs && $nonopt $(test .$module = .yes && echo -bundle $allow_undefined_flag || echo -dynamiclib) -o $lib ${lib}-master.o $deplibs$linker_flags $(test .$module != .yes && echo -install_name $rpath/$soname $verstring)' # We need to add '_' to the symbols in $export_symbols first #archive_expsym_cmds="$archive_cmds"' && strip -s $export_symbols' - hardcode_direct=yes + hardcode_direct=no hardcode_shlibpath_var=no whole_archive_flag_spec='-all_load $convenience' ;; diff -ruN php-4.3.3.orig/ext/gd/gdcache.c php-4.3.3/ext/gd/gdcache.c --- php-4.3.3.orig/ext/gd/gdcache.c Mon Mar 17 19:14:22 2003 +++ php-4.3.3/ext/gd/gdcache.c Thu Aug 28 21:33:23 2003 @@ -52,8 +52,21 @@ /* implementation */ /*********************************************************/ - /* create a new cache */ +#ifdef __APPLE__ +extern gdCache_head_t * +gdCacheCreate( + int size, + gdCacheTestFn_t gdCacheTest, + gdCacheFetchFn_t gdCacheFetch, + gdCacheReleaseFn_t gdCacheRelease ); + +extern void +gdCacheDelete( gdCache_head_t *head ); + +extern void * +gdCacheGet( gdCache_head_t *head, void *keydata ); +#else gdCache_head_t * gdCacheCreate( int size, @@ -130,7 +143,7 @@ elem->userdata = userdata; return userdata; } - +#endif /*********************************************************/