Jacek Caban : dbghelp: Use local NOTE_GNU_BUILD_ID declaration.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 2534c2a2d22d3c610ffdfbb6b33e0b5176509aa1
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=2534c2a2d22d3c610ffdfbb6b...

Author: Jacek Caban 
Date:   Tue Mar 31 18:20:37 2020 +0200

dbghelp: Use local NOTE_GNU_BUILD_ID declaration.

Signed-off-by: Jacek Caban 
Signed-off-by: Alexandre Julliard

---

dlls/dbghelp/elf_module.c    | 4 ----
 dlls/dbghelp/image_private.h | 4 ----
 dlls/dbghelp/module.c        | 6 ++++--
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index 50f19bc79a..196ebcaded 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -47,10 +47,6 @@
 #define ELF_INFO_MODULE         0x0002
 #define ELF_INFO_NAME           0x0004

-#ifndef NT_GNU_BUILD_ID
-#define NT_GNU_BUILD_ID 3
-#endif
-
 #ifndef HAVE_STRUCT_R_DEBUG
 struct r_debug
 {
diff --git a/dlls/dbghelp/image_private.h b/dlls/dbghelp/image_private.h
index 13af7524fe..cd15146a36 100644
--- a/dlls/dbghelp/image_private.h
+++ b/dlls/dbghelp/image_private.h
@@ -54,10 +54,6 @@
 #endif
 #endif

-#ifndef NT_GNU_BUILD_ID
-#define NT_GNU_BUILD_ID 3
-#endif
-
 /* structure holding information while handling an ELF image
  * allows one by one section mapping for memory savings
  */
diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c
index 03bbb1641e..bf7f105bf0 100644
--- a/dlls/dbghelp/module.c
+++ b/dlls/dbghelp/module.c
@@ -34,6 +34,8 @@

WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);

+#define NOTE_GNU_BUILD_ID  3
+
 const WCHAR        S_ElfW[]         = {'<','e','l','f','>','\0'};
 const WCHAR        S_WineLoaderW[]  = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'};
 static const WCHAR S_DotSoW[]       = {'.','s','o','\0'};
@@ -640,7 +642,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE
             if (note != IMAGE_NO_MAP)
             {
                 /* the usual ELF note structure: name-size desc-size type <name> <desc> */
-                if (note[2] == NT_GNU_BUILD_ID)
+                if (note[2] == NOTE_GNU_BUILD_ID)
                 {
                     if (note[1] == idlen &&
                         !memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, idlen))
@@ -686,7 +688,7 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod
         if (note != IMAGE_NO_MAP)
         {
             /* the usual ELF note structure: name-size desc-size type <name> <desc> */
-            if (note[2] == NT_GNU_BUILD_ID)
+            if (note[2] == NOTE_GNU_BUILD_ID)
             {
                 ret = image_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]);
             }