From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Wookey Subject: Re: [PATCH] compat/mingw.c: MSVC build must use ANSI Win32 API's Date: Mon, 28 Sep 2009 19:55:06 +1000 Message-ID: References: <4AB869EE.1020200@viscovery.net> <4AB87B6B.1070808@gmail.com> <4AB89B7F.3050902@gmail.com> <4AC05BA5.4050106@viscovery.net> <4AC06F65.1020301@viscovery.net> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Cc: Marius Storm-Olsen , git@vger.kernel.org, "Shawn O. Pearce" To: Johannes Sixt X-From: git-owner@vger.kernel.org Mon Sep 28 11:55:47 2009 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1MsCxO-0000Iu-PI for gcvg-git-2@lo.gmane.org; Mon, 28 Sep 2009 11:55:47 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751407AbZI1JzX (ORCPT ); Mon, 28 Sep 2009 05:55:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751107AbZI1JzW (ORCPT ); Mon, 28 Sep 2009 05:55:22 -0400 Received: from an-out-0708.google.com ([209.85.132.241]:65380 "EHLO an-out-0708.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbZI1JzW (ORCPT ); Mon, 28 Sep 2009 05:55:22 -0400 Received: by an-out-0708.google.com with SMTP id d40so4672309and.1 for ; Mon, 28 Sep 2009 02:55:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :from:date:message-id:subject:to:cc:content-type; bh=e4WiR9ZsSr3V4KAJ/NDc0pQqNujEW9ghuNO2IDaLQ1Q=; b=QSgLpkNIjo6E26RsL7XXnQ3l02uoIbc+GH3/Rh9zRw8IjRVVL0pQlLlWN9j8BS3uC5 nEp0XoCSUT9mE3K/l20XDH3rqghyrv+8H435xctDSdk032q/9B0NRCXeMwOxGv5HhJdu VCa8mn/AVn9pIEbksvONWCYydnUccdYPnNH/Y= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; b=hJn94gxJIKWI3Xa8nyjpO36VRapA4yj+hL/jwQAE/V7XRS+BebzR+gZYnC5DRa9Oko nTu3PEU7Q+5Js/8nujIwesvNHdtT6toVU0uRcYg6CE56pNU93b+cnyCgFWZTR6VqP/EY u5IZzFqX8UmOg6SgQU+1377Zp0Ic+X+UlVk/c= Received: by 10.101.90.4 with SMTP id s4mr2708402anl.159.1254131726231; Mon, 28 Sep 2009 02:55:26 -0700 (PDT) In-Reply-To: Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: > It seems that the project file that is generated by Vcproj.pm > (inadvertently?) defines UNICODE. Perhaps the patch below is better > than my original workaround. If you think so, I'll create a formal > patch. > > [ sorry if the patch wraps ] > scrub the previous patch... there were more instances of UNICODE defined (for release and debug builds). The patch below takes care of them all. diff --git a/contrib/buildsystems/Generators/Vcproj.pm b/contrib/buildsystems/Generators/Vcproj.pm index 00ec0c1..a215911 100644 --- a/contrib/buildsystems/Generators/Vcproj.pm +++ b/contrib/buildsystems/Generators/Vcproj.pm @@ -173,7 +173,7 @@ sub createLibProject { Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,_DEBUG,$defines" + PreprocessorDefinitions="WIN32,_DEBUG,$defines" MinimalRebuild="true" RuntimeLibrary="1" UsePrecompiledHeader="0" @@ -239,7 +239,7 @@ sub createLibProject { InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,NDEBUG,$defines" + PreprocessorDefinitions="WIN32,NDEBUG,$defines" RuntimeLibrary="0" EnableFunctionLevelLinking="true" UsePrecompiledHeader="0" @@ -395,7 +395,7 @@ sub createAppProject { Optimization="0" InlineFunctionExpansion="1" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,_DEBUG,$defines" + PreprocessorDefinitions="WIN32,_DEBUG,$defines" MinimalRebuild="true" RuntimeLibrary="1" UsePrecompiledHeader="0" @@ -466,7 +466,7 @@ sub createAppProject { InlineFunctionExpansion="1" EnableIntrinsicFunctions="true" AdditionalIncludeDirectories="$includes" - PreprocessorDefinitions="UNICODE,WIN32,NDEBUG,$defines" + PreprocessorDefinitions="WIN32,NDEBUG,$defines" RuntimeLibrary="0"