Fix Windows conflict

lief-project · Feb 15, 2025 · 86760c5 · 86760c5
1 parent f97627c
commit 86760c5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/api/python/src/ELF/objects/NoteDetails/core/pyCoreAuxv.cpp b/api/python/src/ELF/objects/NoteDetails/core/pyCoreAuxv.cpp
@@ -35,7 +35,7 @@ void create<CoreAuxv>(nb::module_& m) {
   #define PY_ENUM(X) .value(LIEF::ELF::to_string(CoreAuxv::TYPE::X), CoreAuxv::TYPE::X)
   LIEF::enum_<CoreAuxv::TYPE>(cls, "TYPE")
     PY_ENUM(END)
-    PY_ENUM(IGNORE)
+    PY_ENUM(IGNORE_TY)
     PY_ENUM(EXECFD)
     PY_ENUM(PHDR)
     PY_ENUM(PHENT)

diff --git a/include/LIEF/ELF/NoteDetails/core/CoreAuxv.hpp b/include/LIEF/ELF/NoteDetails/core/CoreAuxv.hpp
@@ -32,7 +32,7 @@ class LIEF_API CoreAuxv : public Note {
   public:
   enum class TYPE {
     END = 0,       /**< End of vector */
-    IGNORE,        /**< Entry should be ignored */
+    IGNORE_TY,     /**< Entry should be ignored */
     EXECFD,        /**< File descriptor of program */
     PHDR,          /**< Program headers for program */
     PHENT,         /**< Size of program header entry */

diff --git a/src/ELF/NoteDetails/core/CoreAuxv.cpp b/src/ELF/NoteDetails/core/CoreAuxv.cpp
@@ -149,7 +149,7 @@ const char* to_string(CoreAuxv::TYPE type) {
   #define ENTRY(X) std::pair(CoreAuxv::TYPE::X, #X)
   STRING_MAP enums2str {
     ENTRY(END),
-    ENTRY(IGNORE),
+    ENTRY(IGNORE_TY),
     ENTRY(EXECFD),
     ENTRY(PHDR),
     ENTRY(PHENT),

diff --git a/tests/test_define_conflicts.cpp b/tests/test_define_conflicts.cpp
@@ -1,5 +1,6 @@
-#if defined (WIN32)
+#if defined (WIN32) || defined(_MSC_VER)
 #include <windows.h>
+#include <WinBase.h>
 #endif
 
 #include "LIEF/LIEF.hpp"