From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:33705)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1WGb8W-0000rt-E0
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 16:26:34 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1WGb8Q-0000px-IQ
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 16:26:28 -0500
Received: from smtp.mail.uni-mannheim.de ([134.155.96.80]:51672)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <sw@weilnetz.de>) id 1WGb8Q-0000pJ-CL
	for qemu-devel@nongnu.org; Thu, 20 Feb 2014 16:26:22 -0500
Message-ID: <530672F1.4070104@weilnetz.de>
Date: Thu, 20 Feb 2014 22:26:09 +0100
From: Stefan Weil <sw@weilnetz.de>
MIME-Version: 1.0
References: <1392925525-14574-1-git-send-email-peter.maydell@linaro.org>
In-Reply-To: <1392925525-14574-1-git-send-email-peter.maydell@linaro.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] hw/arm/spitz: Avoid clash with Windows
 header symbol MOD_SHIFT
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Peter Maydell <peter.maydell@linaro.org>, qemu-devel@nongnu.org
Cc: patches@linaro.org

Am 20.02.2014 20:45, schrieb Peter Maydell:
> The Windows headers provided by MinGW define MOD_SHIFT. Avoid
> it by using SPITZ_MOD_* for our constants here.
> 
> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
> ---
> The other approach would be just to #undef MOD_SHIFT, (and
> looking back through the archives I see Stefan posted a patch
> to do just that last year) but I think it's cleaner to do this.
> 
> I replaced a few of the /* apostrophe */ keysym names with
> the symbols just to keep us under the 80 column limit...
> ---
>  hw/arm/spitz.c | 108 +++++++++++++++++++++++++++++++--------------------------
>  1 file changed, 58 insertions(+), 50 deletions(-)


That old patch is still in my local queue :-)

There was a suggestion to remove some dependencies on windows.h (which
causes the trouble here). I recently started doing this, and that
approach fixes the warning, too. Maybe I can send a patch next weekend.

Regards
Stefan