From owner-svn-src-all@FreeBSD.ORG Sat Mar 7 00:36:51 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 1D0301065670; Sat, 7 Mar 2009 00:36:51 +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 E48018FC08; Sat, 7 Mar 2009 00:36:50 +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 n270aoo7033174; Sat, 7 Mar 2009 00:36:50 GMT (envelope-from kientzle@svn.freebsd.org) Received: (from kientzle@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n270ao7G033172; Sat, 7 Mar 2009 00:36:50 GMT (envelope-from kientzle@svn.freebsd.org) Message-Id: <200903070036.n270ao7G033172@svn.freebsd.org> From: Tim Kientzle Date: Sat, 7 Mar 2009 00:36:50 +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: r189465 - 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 00:36:51 -0000 Author: kientzle Date: Sat Mar 7 00:36:50 2009 New Revision: 189465 URL: http://svn.freebsd.org/changeset/base/189465 Log: Merge r283,r529 from libarchive.googlecode.com: Fix ext2_fs.h includes for Linux. Modified: head/lib/libarchive/archive_entry.c head/lib/libarchive/archive_write_disk.c Modified: head/lib/libarchive/archive_entry.c ============================================================================== --- head/lib/libarchive/archive_entry.c Sat Mar 7 00:25:33 2009 (r189464) +++ head/lib/libarchive/archive_entry.c Sat Mar 7 00:36:50 2009 (r189465) @@ -39,18 +39,22 @@ __FBSDID("$FreeBSD$"); #include #endif #endif -#ifdef HAVE_EXT2FS_EXT2_FS_H -#include /* for Linux file flags */ -#endif #ifdef HAVE_LIMITS_H #include #endif #ifdef HAVE_LINUX_FS_H #include /* for Linux file flags */ #endif +/* + * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. + * As the include guards don't agree, the order of include is important. + */ #ifdef HAVE_LINUX_EXT2_FS_H #include /* for Linux file flags */ #endif +#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__) +#include /* for Linux file flags */ +#endif #include #include #ifdef HAVE_STDLIB_H Modified: head/lib/libarchive/archive_write_disk.c ============================================================================== --- head/lib/libarchive/archive_write_disk.c Sat Mar 7 00:25:33 2009 (r189464) +++ head/lib/libarchive/archive_write_disk.c Sat Mar 7 00:36:50 2009 (r189465) @@ -51,10 +51,6 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_SYS_UTIME_H #include #endif - -#ifdef HAVE_EXT2FS_EXT2_FS_H -#include /* for Linux file flags */ -#endif #ifdef HAVE_ERRNO_H #include #endif @@ -67,6 +63,16 @@ __FBSDID("$FreeBSD$"); #ifdef HAVE_LINUX_FS_H #include /* for Linux file flags */ #endif +/* + * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h. + * As the include guards don't agree, the order of include is important. + */ +#ifdef HAVE_LINUX_EXT2_FS_H +#include /* for Linux file flags */ +#endif +#if defined(HAVE_EXT2FS_EXT2_FS_H) && !defined(__CYGWIN__) +#include /* Linux file flags, broken on Cygwin */ +#endif #ifdef HAVE_LIMITS_H #include #endif