[flang-commits] [flang] cf5aa55 - [flang] Don't redefine pid_t on MinGW-w64. (#130288)
via flang-commits
flang-commits at lists.llvm.org
Mon Mar 10 10:27:50 PDT 2025
Author: مهدي شينون (Mehdi Chinoune)
Date: 2025-03-10T17:27:47Z
New Revision: cf5aa559a8b69bc39ba134148ace4172fd6de0a8
URL: https://github.com/llvm/llvm-project/commit/cf5aa559a8b69bc39ba134148ace4172fd6de0a8
DIFF: https://github.com/llvm/llvm-project/commit/cf5aa559a8b69bc39ba134148ace4172fd6de0a8.diff
LOG: [flang] Don't redefine pid_t on MinGW-w64. (#130288)
Added:
Modified:
flang-rt/lib/runtime/command.cpp
flang/include/flang/Optimizer/Builder/Runtime/RTBuilder.h
flang/include/flang/Runtime/command.h
Removed:
################################################################################
diff --git a/flang-rt/lib/runtime/command.cpp b/flang-rt/lib/runtime/command.cpp
index 8a5a61ac1ad44..9ada5bd59c0b7 100644
--- a/flang-rt/lib/runtime/command.cpp
+++ b/flang-rt/lib/runtime/command.cpp
@@ -21,9 +21,11 @@
#define getcwd _getcwd
#define PATH_MAX MAX_PATH
+#ifdef _MSC_VER
// On Windows GetCurrentProcessId returns a DWORD aka uint32_t
#include <processthreadsapi.h>
inline pid_t getpid() { return GetCurrentProcessId(); }
+#endif
#else
#include <unistd.h> //getpid()
diff --git a/flang/include/flang/Optimizer/Builder/Runtime/RTBuilder.h b/flang/include/flang/Optimizer/Builder/Runtime/RTBuilder.h
index 5158abaa31ed1..722e9191be728 100644
--- a/flang/include/flang/Optimizer/Builder/Runtime/RTBuilder.h
+++ b/flang/include/flang/Optimizer/Builder/Runtime/RTBuilder.h
@@ -30,7 +30,7 @@
#include <cstdint>
#include <functional>
-#ifdef _WIN32
+#ifdef _MSC_VER
// On Windows* OS GetCurrentProcessId returns DWORD aka uint32_t
typedef std::uint32_t pid_t;
#endif
diff --git a/flang/include/flang/Runtime/command.h b/flang/include/flang/Runtime/command.h
index 7ab3f6442dcf9..3add66dd50d4a 100644
--- a/flang/include/flang/Runtime/command.h
+++ b/flang/include/flang/Runtime/command.h
@@ -12,7 +12,7 @@
#include "flang/Runtime/entry-names.h"
#include <cstdint>
-#ifdef _WIN32
+#ifdef _MSC_VER
// On Windows* OS GetCurrentProcessId returns DWORD aka uint32_t
typedef std::uint32_t pid_t;
#else
More information about the flang-commits
mailing list