Skip to content

Conversation

@Jlalond
Copy link
Contributor

@Jlalond Jlalond commented Jun 26, 2024

image

In #95312 uint and #include <unistd.h> were introduced. These broke the windows build. I addressed uint in #96564, but include went unfixed. So I acquired myself a windows machine to validate.

@Jlalond Jlalond requested a review from JDevlieghere as a code owner June 26, 2024 03:07
@llvmbot llvmbot added the lldb label Jun 26, 2024
@Jlalond Jlalond requested review from petrhosek and vvereschaka June 26, 2024 03:07
@llvmbot
Copy link
Member

llvmbot commented Jun 26, 2024

@llvm/pr-subscribers-lldb

Author: Jacob Lalonde (Jlalond)

Changes

image

In #95312 uint and #include &lt;unistd.h&gt; were introduced. These broke the windows build. I addressed uint in #96564, but include went unfixed. So I acquired myself a windows machine to validate.


Full diff: https://github.com/llvm/llvm-project/pull/96724.diff

1 Files Affected:

  • (modified) lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp (-1)
diff --git a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
index 3668c37c5191d..7c875aa3223ed 100644
--- a/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
+++ b/lldb/source/Plugins/ObjectFile/Minidump/ObjectFileMinidump.cpp
@@ -18,7 +18,6 @@
 #include "lldb/Utility/Log.h"
 
 #include "llvm/Support/FileSystem.h"
-#include <unistd.h>
 
 using namespace lldb;
 using namespace lldb_private;

@Jlalond
Copy link
Contributor Author

Jlalond commented Jun 26, 2024

Hey @petrhosek @vvereschaka apologies about the delay, I had to get a Windows machine up to validate this.

@vvereschaka
Copy link
Contributor

Thank you @Jlalond , I started checking the local builds on Windows/Linux hosts with these changes.

Copy link
Contributor

@vvereschaka vvereschaka left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM.

@Jlalond Jlalond merged commit cb3469a into llvm:main Jun 26, 2024
@Jlalond Jlalond changed the title Removed header and validated on new windows machine [LLDB][Windows Build]Removed header and validated on new windows machine Jun 26, 2024
AlexisPerry pushed a commit to llvm-project-tlp/llvm-project that referenced this pull request Jul 9, 2024
![image](https://github.com/llvm/llvm-project/assets/25160653/2044cc8e-72d5-49ec-9439-256555f5fd2b)

In llvm#95312 uint and `#include <unistd.h>` were introduced. These broke
the windows build. I addressed uint in llvm#96564, but include went unfixed.
So I acquired myself a windows machine to validate.
@Jlalond Jlalond deleted the minidump-windows-fix branch August 6, 2024 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants