From 3b325db87a41e8e7e09517c3ab0c742260f1112e Mon Sep 17 00:00:00 2001 From: Taco Hoekwater Date: Tue, 6 May 2008 12:52:27 +0000 Subject: Portability fixes for AIX and Solaris from Vladimir Volovich git-svn-id: svn://tug.org/texlive/trunk@7897 c570f23f-e606-0410-a88d-b1316a301751 --- Build/source/libs/zziplib/zzip/Makefile | 2 +- Build/source/libs/zziplib/zzip/_config.h | 3 ++- Build/source/libs/zziplib/zzip/conf.h | 3 +++ Build/source/libs/zziplib/zzip/file.c | 3 +++ Build/source/libs/zziplib/zzip/mmapped.c | 3 ++- Build/source/libs/zziplib/zzip/stat.c | 3 +++ 6 files changed, 14 insertions(+), 3 deletions(-) (limited to 'Build') diff --git a/Build/source/libs/zziplib/zzip/Makefile b/Build/source/libs/zziplib/zzip/Makefile index f12e62ae9d3..0380cd25c4d 100644 --- a/Build/source/libs/zziplib/zzip/Makefile +++ b/Build/source/libs/zziplib/zzip/Makefile @@ -9,7 +9,7 @@ RANLIB = ranlib OBJECTS =dir.o err.o fetch.o file.o info.o memdisk.o mmapped.o \ plugin.o stat.o write.o zip.o -_CFLAGS = -DHAVE_CONFIG_H -I.. -I../../../../libs/zziplib -I../../../../libs/zlib -Wall +_CFLAGS = -DHAVE_CONFIG_H -I.. -I../../../../libs/zziplib -I../../../../libs/zlib XCFLAGS = $(_CFLAGS) diff --git a/Build/source/libs/zziplib/zzip/_config.h b/Build/source/libs/zziplib/zzip/_config.h index ebc6aab6f82..65873ed7143 100644 --- a/Build/source/libs/zziplib/zzip/_config.h +++ b/Build/source/libs/zziplib/zzip/_config.h @@ -57,9 +57,10 @@ /* Define to 1 if you have the header file, and it defines `DIR'. */ /* #undef ZZIP_HAVE_NDIR_H */ -#ifdef __sun__ +#if defined __sun__ || defined __sun /* Define to 1 if you have the header file. */ #define ZZIP_HAVE_SYS_INT_TYPES_H 1 +#elif defined(_AIX) #else /* Define to 1 if you have the header file. */ #define ZZIP_HAVE_STDINT_H 1 diff --git a/Build/source/libs/zziplib/zzip/conf.h b/Build/source/libs/zziplib/zzip/conf.h index 1f58a164dba..c6d7ad6f84d 100644 --- a/Build/source/libs/zziplib/zzip/conf.h +++ b/Build/source/libs/zziplib/zzip/conf.h @@ -64,6 +64,9 @@ #define _zzip_const const #endif #endif +#ifdef _AIX +#define _zzip_inline __inline +#endif #ifndef _zzip_inline #ifdef ZZIP_inline #define _zzip_inline ZZIP_inline diff --git a/Build/source/libs/zziplib/zzip/file.c b/Build/source/libs/zziplib/zzip/file.c index 4944cd7c74a..af3ed07e556 100644 --- a/Build/source/libs/zziplib/zzip/file.c +++ b/Build/source/libs/zziplib/zzip/file.c @@ -15,6 +15,9 @@ #include #include +#ifdef ZZIP_HAVE_STRINGS_H +#include +#endif #include #include #include diff --git a/Build/source/libs/zziplib/zzip/mmapped.c b/Build/source/libs/zziplib/zzip/mmapped.c index a3a4a46d922..645c4de6d45 100644 --- a/Build/source/libs/zziplib/zzip/mmapped.c +++ b/Build/source/libs/zziplib/zzip/mmapped.c @@ -43,7 +43,8 @@ #if defined ZZIP_HAVE_STRING_H #include -#elif defined ZZIP_HAVE_STRINGS_H +#endif +#if defined ZZIP_HAVE_STRINGS_H #include #endif diff --git a/Build/source/libs/zziplib/zzip/stat.c b/Build/source/libs/zziplib/zzip/stat.c index 0395c67b60a..95bcf0c4051 100644 --- a/Build/source/libs/zziplib/zzip/stat.c +++ b/Build/source/libs/zziplib/zzip/stat.c @@ -20,6 +20,9 @@ #include /* exported...*/ #include #include +#ifdef ZZIP_HAVE_STRINGS_H +#include +#endif #include #define ZZIP_USE_INTERNAL -- cgit v1.2.3