From b6eab1d06c7f025607652427570c38c2dc7ba406 Mon Sep 17 00:00:00 2001 From: Jiri Malak Date: Wed, 12 Mar 2014 08:02:37 +0100 Subject: [PATCH] rest of changes to be buildable by Open Watcom --- libarchive/archive.h | 2 +- libarchive/archive_entry.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 /* 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 @@ -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 -- 2.47.2