diff options
author | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-07-05 13:57:49 +0000 |
---|---|---|
committer | Peter Breitenlohner <peb@mppmu.mpg.de> | 2010-07-05 13:57:49 +0000 |
commit | bd3749566d917b091daaebf65e7ebcf079cf10fa (patch) | |
tree | a72239a66a140f223a4073c2239c3aee00d153ff /Build/source/libs/zziplib | |
parent | c4a2d6947cdfbd692cc0a3ff4807b9d4404768c6 (diff) |
build fixes for aix and sun, from Vladimir
git-svn-id: svn://tug.org/texlive/trunk@19245 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/libs/zziplib')
3 files changed, 33 insertions, 2 deletions
diff --git a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog index b0b60667060..8e6013b47ab 100644 --- a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog +++ b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2010-07-05 Peter Breitenlohner <peb@mppmu.mpg.de> + + * patch-03-inline (new): Can't use non-static inline for Sun + Studio C, mail from Vladimir Volovich, Wed, 16 Jun 2010 20:18:17. + 2010-06-04 Peter Breitenlohner <peb@mppmu.mpg.de> * patch-02-aix-strcasecmp (new): Need to #include <strings.h> diff --git a/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/patch-03-inline b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/patch-03-inline new file mode 100644 index 00000000000..8b61a56bdf1 --- /dev/null +++ b/Build/source/libs/zziplib/zziplib-0.13.58-PATCHES/patch-03-inline @@ -0,0 +1,26 @@ + The Sun Studio C compiler may require a global non-inline + definition. + + This function actually ought to be 'static inline'. + +diff -ur zziplib-0.13.58.orig/zzip/zip.c zziplib-0.13.58/zzip/zip.c +--- zziplib-0.13.58.orig/zzip/zip.c 2009-08-23 13:38:22.000000000 +0200 ++++ zziplib-0.13.58/zzip/zip.c 2010-07-05 15:10:44.401672730 +0200 +@@ -88,7 +88,7 @@ + struct zzip_dir_hdr **hdr_return, + zzip_plugin_io_t io); + +-_zzip_inline char *__zzip_aligned4(char *p); ++char *__zzip_aligned4(char *p); + + /* ------------------------ harden routines ------------------------------ */ + +@@ -375,7 +375,7 @@ + * to pointer types but we do need only the lower bits in this implementation, + * so we can just cast the value to a long value. + */ +-_zzip_inline char * ++char * + __zzip_aligned4(char *p) + { + #define aligned4 __zzip_aligned4 diff --git a/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c b/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c index 0a400cd47d8..cdbf1979773 100644 --- a/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c +++ b/Build/source/libs/zziplib/zziplib-0.13.58/zzip/zip.c @@ -88,7 +88,7 @@ int __zzip_parse_root_directory(int fd, struct zzip_dir_hdr **hdr_return, zzip_plugin_io_t io); -_zzip_inline char *__zzip_aligned4(char *p); +char *__zzip_aligned4(char *p); /* ------------------------ harden routines ------------------------------ */ @@ -375,7 +375,7 @@ __zzip_fetch_disk_trailer(int fd, zzip_off_t filesize, * to pointer types but we do need only the lower bits in this implementation, * so we can just cast the value to a long value. */ -_zzip_inline char * +char * __zzip_aligned4(char *p) { #define aligned4 __zzip_aligned4 |