From: Jiri Malak <malak.jiri@gmail.com>
Date: Wed, 12 Mar 2014 07:02:37 +0000 (+0100)
Subject: rest of changes to be buildable by Open Watcom
X-Git-Tag: v3.1.900a~314^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b6eab1d06c7f025607652427570c38c2dc7ba406;p=thirdparty%2Flibarchive.git

rest of changes to be buildable by Open Watcom
---

diff --git a/libarchive/archive.h b/libarchive/archive.h
index 1b01741ff..e90cb4931 100644
--- a/libarchive/archive.h
+++ b/libarchive/archive.h
@@ -47,7 +47,7 @@
 
 /* Get appropriate definitions of standard POSIX-style types. */
 /* These should match the types used in 'struct stat' */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
 # define	__LA_INT64_T	__int64
 # if defined(_SSIZE_T_DEFINED) || defined(_SSIZE_T_)
 #  define	__LA_SSIZE_T	ssize_t
diff --git a/libarchive/archive_entry.h b/libarchive/archive_entry.h
index 2f7fc6d1e..dfba11b45 100644
--- a/libarchive/archive_entry.h
+++ b/libarchive/archive_entry.h
@@ -44,7 +44,7 @@
 #include <time.h>
 
 /* Get a suitable 64-bit integer type. */
-#if defined(_WIN32) && !defined(__CYGWIN__)
+#if defined(_WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__)
 # define	__LA_INT64_T	__int64
 #else
 #include <unistd.h>
@@ -59,7 +59,7 @@
 #if ARCHIVE_VERSION_NUMBER >= 3999000
 /* Switch to plain 'int' for libarchive 4.0.  It's less broken than 'mode_t' */
 # define	__LA_MODE_T	int
-#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__)
+#elif defined(_WIN32) && !defined(__CYGWIN__) && !defined(__BORLANDC__) && !defined(__WATCOMC__)
 # define	__LA_MODE_T	unsigned short
 #else
 # define	__LA_MODE_T	mode_t