Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 3 Mar 2009 03:28:09 +0000 (UTC)
From:      Tim Kientzle <kientzle@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r189293 - head/lib/libarchive
Message-ID:  <200903030328.n233S9c2093935@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kientzle
Date: Tue Mar  3 03:28:09 2009
New Revision: 189293
URL: http://svn.freebsd.org/changeset/base/189293

Log:
  Merge r272 from libarchive.googlecode.com: Fix building on MSVC6.

Modified:
  head/lib/libarchive/archive_endian.h

Modified: head/lib/libarchive/archive_endian.h
==============================================================================
--- head/lib/libarchive/archive_endian.h	Tue Mar  3 02:16:12 2009	(r189292)
+++ head/lib/libarchive/archive_endian.h	Tue Mar  3 03:28:09 2009	(r189293)
@@ -41,8 +41,10 @@
  * - SGI MIPSpro
  * - Microsoft Visual C++ 6.0 (supposedly newer versions too)
  */
-#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER)
+#if defined(__WATCOMC__) || defined(__sgi)
 #define	inline
+#elif defined(_MSC_VER)
+#define inline __inline
 #endif
 
 /* Alignment-agnostic encode/decode bytestream to/from little/big endian. */



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903030328.n233S9c2093935>