From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 7805 invoked by alias); 8 Jan 2009 12:53:20 -0000 Received: (qmail 7797 invoked by uid 22791); 8 Jan 2009 12:53:20 -0000 X-SWARE-Spam-Status: No, hits=-2.4 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: sourceware.org Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 08 Jan 2009 12:53:15 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 9ED852A968B for ; Thu, 8 Jan 2009 07:53:13 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id 8hKZYSl7lSeU for ; Thu, 8 Jan 2009 07:53:13 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id D89092A9689 for ; Thu, 8 Jan 2009 07:53:12 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id DEB3AE7ACD; Thu, 8 Jan 2009 16:53:05 +0400 (RET) Date: Thu, 08 Jan 2009 12:53:00 -0000 From: Joel Brobecker To: gdb-patches@sourceware.org Subject: Re: [RFA/win32] Avoid a couple of name collisions in win32-nat.c Message-ID: <20090108125305.GA20220@adacore.com> References: <20090107112422.GB1751@adacore.com> <20090107165734.GD31906@ednor.casa.cgf.cx> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090107165734.GD31906@ednor.casa.cgf.cx> User-Agent: Mutt/1.4.2.2i Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org X-SW-Source: 2009-01/txt/msg00149.txt.bz2 > >2009-01-07 Joel Brobecker > > > > * win32-nat.c (kernel32_DebugSetProcessKillOnExit): Renames > > DebugSetProcessKillOnExit. Update all uses in this file. > > (kernel32_DebugActiveProcessStop): Renames DebugActiveProcessStop. > > Update all uses in this file. > > > >Tested on x86-windows. > > > >OK to apply? > > Ah, should have read further. I don't understand why this is now a > problem. What changed? I think I understand what changed. In winbase.h, the functions are defined conditionally: #if (_WIN32_WINNT >= 0x0501) WINBASEAPI BOOL WINAPI DebugBreakProcess(HANDLE); WINBASEAPI BOOL WINAPI DebugSetProcessKillOnExit(BOOL); #endif Digging further, I found that _WIN32_WINNT is defined in windef.h: #ifndef WINVER #define WINVER 0x0400 /* * If you need Win32 API features newer the Win95 and WinNT then you must * define WINVER before including windows.h or any other method of including * the windef.h header. */ #endif #ifndef _WIN32_WINNT #define _WIN32_WINNT WINVER #endif However, on the x86_64-windows MinGW headers that we have, it's unconditionally defined. I will look at the ones I missed. -- Joel