From owner-svn-src-all@FreeBSD.ORG Sat Mar 7 03:04:06 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 65157106564A; Sat, 7 Mar 2009 03:04:06 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 531018FC1A; Sat, 7 Mar 2009 03:04:06 +0000 (UTC) (envelope-from kientzle@FreeBSD.org) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n2734655036791; Sat, 7 Mar 2009 03:04:06 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n27346Gl036790; Sat, 7 Mar 2009 03:04:06 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200903070304.n27346Gl036790@svn.freebsd.org> From: Tim Kientzle Date: Sat, 7 Mar 2009 03:04:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r189480 - head/lib/libarchive X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Mar 2009 03:04:06 -0000 Author: kientzle Date: Sat Mar 7 03:04:06 2009 New Revision: 189480 URL: http://svn.freebsd.org/changeset/base/189480 Log: Merge r540 from libarchive.googlecode.com: Interix doesn't have inttypes.h either. Modified: head/lib/libarchive/archive.h Modified: head/lib/libarchive/archive.h ============================================================================== --- head/lib/libarchive/archive.h Sat Mar 7 03:00:44 2009 (r189479) +++ head/lib/libarchive/archive.h Sat Mar 7 03:04:06 2009 (r189480) @@ -38,8 +38,8 @@ #include #include /* Linux requires this for off_t */ -#if !defined(__WATCOMC__) && !defined(_MSC_VER) -/* Header unavailable on Watcom C or MS Visual C++. */ +#if !defined(__WATCOMC__) && !defined(_MSC_VER) && !defined(__INTERIX) +/* Header unavailable on Watcom C or MS Visual C++ or SFU. */ #include /* int64_t, etc. */ #endif #include /* For FILE * */