From 0c793018079803628b5aeee6bbc1e6464fbefd65 Mon Sep 17 00:00:00 2001 From: Aaron Ballman Date: Sat, 8 Jun 2013 20:29:03 +0000 Subject: [PATCH] =?UTF-8?q?sys::process::get=5Fid()=20now=20returns=20the?= =?UTF-8?q?=20process=20ID=20instead=20of=20a=20process=20handle=20on=20Wi?= =?UTF-8?q?ndows.=20=20Patch=20thanks=20to=20Kim=20Gr=C3=A4sman!?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183621 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/Process.h | 6 +++--- lib/Support/Windows/Process.inc | 2 +- unittests/Support/ProcessTest.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/llvm/Support/Process.h b/include/llvm/Support/Process.h index 4256d4a03b9..0baf7b911c1 100644 --- a/include/llvm/Support/Process.h +++ b/include/llvm/Support/Process.h @@ -50,13 +50,13 @@ protected: public: /// \brief Operating system specific type to identify a process. /// - /// Note that the windows one is defined to 'void *' as this is the - /// documented type for HANDLE on windows, and we don't want to pull in the + /// Note that the windows one is defined to 'unsigned long' as this is the + /// documented type for DWORD on windows, and we don't want to pull in the /// Windows headers here. #if defined(LLVM_ON_UNIX) typedef pid_t id_type; #elif defined(LLVM_ON_WIN32) - typedef void *id_type; // Must match the type of HANDLE. + typedef unsigned long id_type; // Must match the type of DWORD. #else #error Unsupported operating system. #endif diff --git a/lib/Support/Windows/Process.inc b/lib/Support/Windows/Process.inc index ad9412852f1..359b99f5131 100644 --- a/lib/Support/Windows/Process.inc +++ b/lib/Support/Windows/Process.inc @@ -40,7 +40,7 @@ using namespace sys; process::id_type self_process::get_id() { - return GetCurrentProcess(); + return GetCurrentProcessId(); } static TimeValue getTimeValueFromFILETIME(FILETIME Time) { diff --git a/unittests/Support/ProcessTest.cpp b/unittests/Support/ProcessTest.cpp index e57c0e6eaf8..eff9c711a1a 100644 --- a/unittests/Support/ProcessTest.cpp +++ b/unittests/Support/ProcessTest.cpp @@ -26,7 +26,7 @@ TEST(ProcessTest, SelfProcess) { #if defined(LLVM_ON_UNIX) EXPECT_EQ(getpid(), process::get_self()->get_id()); #elif defined(LLVM_ON_WIN32) - EXPECT_EQ(GetCurrentProcess(), process::get_self()->get_id()); + EXPECT_EQ(GetCurrentProcessId(), process::get_self()->get_id()); #endif EXPECT_LT(1u, process::get_self()->page_size());