summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2005-10-12 09:40:29 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2005-10-12 09:40:29 +0000
commitc3a1f48c42f8c805d48e5d85049b74ccff3b824c (patch)
tree354a58c0ecdf94af7633561bcc1908d4931c7d56
parent16d4791f87d540cb775f1e9f43b2be89a54514b1 (diff)
downloadcygnal-c3a1f48c42f8c805d48e5d85049b74ccff3b824c.tar.gz
cygnal-c3a1f48c42f8c805d48e5d85049b74ccff3b824c.tar.bz2
cygnal-c3a1f48c42f8c805d48e5d85049b74ccff3b824c.zip
* include/winbase.h (GetProcessId): Remove duplicate declaration.
Use _WIN32_WINNT >= 0x0501 guard.
-rw-r--r--winsup/w32api/ChangeLog5
-rw-r--r--winsup/w32api/include/winbase.h5
2 files changed, 6 insertions, 4 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 6058a603a..f2b79eccf 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-12 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/winbase.h (GetProcessId): Remove duplicate declaration.
+ Use _WIN32_WINNT >= 0x0501 guard.
+
2005-10-11 Christopher Faylor <cgf@timesys.com>
* include/winbase.h (GetProcessId): Declare.
diff --git a/winsup/w32api/include/winbase.h b/winsup/w32api/include/winbase.h
index b4473244a..fdfb2be5f 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)