From owner-svn-ports-all@FreeBSD.ORG Mon May 27 12:35:33 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id D8FCD27A; Mon, 27 May 2013 12:35:33 +0000 (UTC) (envelope-from bapt@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id AF9D7F3A; Mon, 27 May 2013 12:35:33 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r4RCZXLD086617; Mon, 27 May 2013 12:35:33 GMT (envelope-from bapt@svn.freebsd.org) Received: (from bapt@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r4RCZXAt086616; Mon, 27 May 2013 12:35:33 GMT (envelope-from bapt@svn.freebsd.org) Message-Id: <201305271235.r4RCZXAt086616@svn.freebsd.org> From: Baptiste Daroussin Date: Mon, 27 May 2013 12:35:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r319225 - head/devel/libytnef/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 27 May 2013 12:35:33 -0000 Author: bapt Date: Mon May 27 12:35:33 2013 New Revision: 319225 URL: http://svnweb.freebsd.org/changeset/ports/319225 Log: Fix build with clang Modified: head/devel/libytnef/files/patch-ytnef.c Modified: head/devel/libytnef/files/patch-ytnef.c ============================================================================== --- head/devel/libytnef/files/patch-ytnef.c Mon May 27 12:32:13 2013 (r319224) +++ head/devel/libytnef/files/patch-ytnef.c Mon May 27 12:35:33 2013 (r319225) @@ -1,6 +1,6 @@ ---- ./ytnef.c.orig 2004-08-26 13:09:05.000000000 -0400 -+++ ./ytnef.c 2012-05-28 14:33:34.000000000 -0400 -@@ -426,6 +426,13 @@ +--- ytnef.c.orig 2004-08-26 19:09:05.000000000 +0200 ++++ ytnef.c 2013-05-27 14:30:52.142061290 +0200 +@@ -426,6 +426,13 @@ void TNEFFillMapi(TNEFStruct *TNEF, BYTE d += num + ((num % 4) ? (4 - num%4) : 0); break; @@ -14,7 +14,7 @@ case PT_I2: // Read in 2 bytes, but proceed by 4 bytes vl->size = 2; -@@ -455,6 +462,8 @@ +@@ -455,6 +462,8 @@ void TNEFFillMapi(TNEFStruct *TNEF, BYTE memcpy(vl->data, &temp_ddword, vl->size); d+=8; break; @@ -23,3 +23,36 @@ } if (count == (mp->count-1)) { count = -1; +@@ -565,7 +574,7 @@ void TNEFPrintDate(dtr Date) { + int TNEFHexBreakdown STD_ARGLIST { + int i; + if (TNEF->Debug == 0) +- return; ++ return 0; + + printf("%s: [%i bytes] \n", TNEFList[id].name, size); + +@@ -574,13 +583,14 @@ int TNEFHexBreakdown STD_ARGLIST { + if ((i+1)%16 == 0) printf("\n"); + } + printf("\n"); ++ return 0; + } + + // ----------------------------------------------------------------------------- + int TNEFDetailedPrint STD_ARGLIST { + int i; + if (TNEF->Debug == 0) +- return; ++ return 0; + + printf("%s: [%i bytes] \n", TNEFList[id].name, size); + +@@ -588,6 +598,7 @@ int TNEFDetailedPrint STD_ARGLIST { + printf("%c", data[i]); + } + printf("\n"); ++ return 0; + } + + // -----------------------------------------------------------------------------