[ros-diffs] [reactos] 131/179: [WINESYNC] dbghelp: Use local NOTE_GNU_BUILD_ID declaration.

[winesync]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=eed384bb16f73a05df824…

commit eed384bb16f73a05df82427402375d1ca904493a
Author:     winesync <ros-dev(a)reactos.org>
AuthorDate: Fri Sep 11 18:52:54 2020 +0200
Commit:     Jérôme Gardou <jerome.gardou(a)reactos.org>
CommitDate: Wed Sep 16 10:35:52 2020 +0200

    [WINESYNC] dbghelp: Use local NOTE_GNU_BUILD_ID declaration.
    
    Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
    Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
    
    wine commit id 2534c2a2d22d3c610ffdfbb6b33e0b5176509aa1 by Jacek Caban
<jacek(a)codeweavers.com>
---
 dll/win32/dbghelp/elf_module.c    | 4 ----
 dll/win32/dbghelp/image_private.h | 4 ----
 dll/win32/dbghelp/module.c        | 6 ++++--
 sdk/tools/winesync/dbghelp.cfg    | 2 +-
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/dll/win32/dbghelp/elf_module.c b/dll/win32/dbghelp/elf_module.c
index 50f19bc79a3..196ebcaded8 100644
--- a/dll/win32/dbghelp/elf_module.c
+++ b/dll/win32/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/dll/win32/dbghelp/image_private.h b/dll/win32/dbghelp/image_private.h
index 955f7790a7a..37f715b55e7 100644
--- a/dll/win32/dbghelp/image_private.h
+++ b/dll/win32/dbghelp/image_private.h
@@ -56,10 +56,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/dll/win32/dbghelp/module.c b/dll/win32/dbghelp/module.c
index 80a484e94ae..094b4f77faa 100644
--- a/dll/win32/dbghelp/module.c
+++ b/dll/win32/dbghelp/module.c
@@ -36,6 +36,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
 
+#define NOTE_GNU_BUILD_ID  3
+
 const WCHAR        S_ElfW[]         =
{'<','e','l','f','>','\0'};
 #ifndef __REACTOS__
 const WCHAR        S_WineLoaderW[]  =
{'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'};
@@ -663,7 +665,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))
@@ -709,7 +711,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]);
             }
diff --git a/sdk/tools/winesync/dbghelp.cfg b/sdk/tools/winesync/dbghelp.cfg
index 0a7d21bd580..f16ecdcb0df 100644
--- a/sdk/tools/winesync/dbghelp.cfg
+++ b/sdk/tools/winesync/dbghelp.cfg
@@ -4,4 +4,4 @@ files:
   include/dbghelp.h: sdk/include/psdk/dbghelp.h
   include/wine/mscvpdb.h: sdk/include/reactos/wine/mscvpdb.h
 tags:
-  wine: 94ad6bd2e66f589303fe9102b9a81b1f3e8ea9c6
+  wine: 2534c2a2d22d3c610ffdfbb6b33e0b5176509aa1