From c3a1f48c42f8c805d48e5d85049b74ccff3b824c Mon Sep 17 00:00:00 2001 From: Danny Smith Date: Wed, 12 Oct 2005 09:40:29 +0000 Subject: * include/winbase.h (GetProcessId): Remove duplicate declaration. Use _WIN32_WINNT >= 0x0501 guard. --- winsup/w32api/ChangeLog | 5 +++++ winsup/w32api/include/winbase.h | 5 +---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 6058a60..f2b79ec 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,8 @@ +2005-10-12 Danny Smith + + * include/winbase.h (GetProcessId): Remove duplicate declaration. + Use _WIN32_WINNT >= 0x0501 guard. + 2005-10-11 Christopher Faylor * include/winbase.h (GetProcessId): Declare. diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h index b447324..fdfb2be 100644 --- a/winsup/w32api/include/winbase.h +++ b/winsup/w32api/include/winbase.h @@ -1350,9 +1350,6 @@ WINBASEAPI HANDLE WINAPI GetCurrentProcess(void); WINBASEAPI DWORD WINAPI GetCurrentProcessId(void); WINBASEAPI HANDLE WINAPI GetCurrentThread(void); WINBASEAPI DWORD WINAPI GetCurrentThreadId(void); -#if (_WIN32_WINNT >= 0x0501) -WINBASEAPI DWORD WINAPI GetProcessId(HANDLE); -#endif #define GetCurrentTime GetTickCount WINBASEAPI BOOL WINAPI GetDefaultCommConfigA(LPCSTR,LPCOMMCONFIG,PDWORD); WINBASEAPI BOOL WINAPI GetDefaultCommConfigW(LPCWSTR,LPCOMMCONFIG,PDWORD); @@ -1438,7 +1435,7 @@ WINBASEAPI BOOL WINAPI GetProcessHandleCount(HANDLE,PDWORD); #endif WINBASEAPI HANDLE WINAPI GetProcessHeap(VOID); WINBASEAPI DWORD WINAPI GetProcessHeaps(DWORD,PHANDLE); -#if (_WIN32_WINNT >= 0x0502) +#if (_WIN32_WINNT >= 0x0501) WINBASEAPI DWORD WINAPI GetProcessId(HANDLE); #endif #if (_WIN32_WINNT >= 0x0500) -- cgit v1.1