From owner-svn-src-head@FreeBSD.ORG Mon Dec 8 05:47:25 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 243C01065678 for ; Mon, 8 Dec 2008 05:47:25 +0000 (UTC) (envelope-from moguabjy@gmail.com) Received: from ti-out-0910.google.com (ti-out-0910.google.com [209.85.142.189]) by mx1.freebsd.org (Postfix) with ESMTP id B13258FC18 for ; Mon, 8 Dec 2008 05:47:24 +0000 (UTC) (envelope-from moguabjy@gmail.com) Received: by ti-out-0910.google.com with SMTP id a1so629922tib.3 for ; Sun, 07 Dec 2008 21:47:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:sender :to:subject:cc:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references :x-google-sender-auth; bh=ehtrZMpa9QIQ4eXXFGRp4xYUcLs4EvlPg1lvxTDCuJ0=; b=Dl7t3NQUxcMYjsOsiuuTTos2NPPaRHyrZ+46C76yMEmu8KL7HQxWhZlq+W+ORcyraA vw2g/wrYJF7l4oI7B2DP8SDegnmJQJ0wKv58+rDgiS6eMAQFs/D68GN6j3DNUYCZFOGF jgt64TwU15xfi/ITq+nomfvvBfWCGqCcV149k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:cc:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references:x-google-sender-auth; b=f8fO8Fj589Qj+NmZlkzRI9+USl3VS08IEvqbwnN59Jnstm5D+qZHg7ns/BOxx6UUEK s8aLero8lNWqkaHzMvRi4r44I71js2AJ2pSVQM1kVuWuxCz/RN7G/kAg8t0FHt1AJqV+ p+fWJb44/kYlDKk4Qa2DIQ+iZNxGWgeznAQjg= Received: by 10.110.49.6 with SMTP id w6mr2851362tiw.40.1228713272653; Sun, 07 Dec 2008 21:14:32 -0800 (PST) Received: by 10.110.33.11 with HTTP; Sun, 7 Dec 2008 21:14:32 -0800 (PST) Message-ID: Date: Mon, 8 Dec 2008 14:14:32 +0900 From: "Bang Jun-young" Sender: moguabjy@gmail.com To: "Tim Kientzle" In-Reply-To: <200812060612.mB66COVb084955@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <200812060612.mB66COVb084955@svn.freebsd.org> X-Google-Sender-Auth: 1bfb078a58ebc179 Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: svn commit: r185674 - head/lib/libarchive X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2008 05:47:25 -0000 On Sat, Dec 6, 2008 at 3:12 PM, Tim Kientzle wrote: > Author: kientzle > Date: Sat Dec 6 06:12:24 2008 > New Revision: 185674 > URL: http://svn.freebsd.org/changeset/base/185674 > > Log: > A couple of portability fixes from Joerg Sonnenberger > > Modified: > head/lib/libarchive/archive_endian.h > > Modified: head/lib/libarchive/archive_endian.h > ============================================================================== > --- head/lib/libarchive/archive_endian.h Sat Dec 6 06:08:12 2008 (r185673) > +++ head/lib/libarchive/archive_endian.h Sat Dec 6 06:12:24 2008 (r185674) > @@ -35,14 +35,14 @@ > #define ARCHIVE_ENDIAN_H_INCLUDED > > > -/* Watcom C++ doesn't support 'inline' in C code. (For any version?) */ > -#if defined( __WATCOMC__ ) > - #define inline > -#endif > - > -/* Visual C++ 6.0 doesn't support 'inline' in C code. (Does VC7? VC8?) */ > -#if defined(_MSC_VER) > - #define inline > +/* > + * Disabling inline keyword for compilers known to choke on it: > + * - Watcom C++ in C code. (For any version?) > + * - SGI MIPSpro > + * - Microsoft Visual C++ 6.0 (supposedly newer versions too) > + */ > +#if defined(__WATCOMC__) || defined(__sgi) || defined(_MSC_VER) > +#define inline > #endif MSC actually supports inline functions as '__inline' keyword in C mode. The above should be written as follows: #if defined(__WATCOMC__) || defined(__sgi) #define inline #elif defined(_MSC_VER) #define inline __inline #endif See http://msdn.microsoft.com/en-us/library/z8y1yy88.aspx http://msdn.microsoft.com/en-us/library/aa260842.aspx for details. junyoung