Commit 2534c2a2 authored by Jacek Caban's avatar Jacek Caban Committed by Alexandre Julliard

dbghelp: Use local NOTE_GNU_BUILD_ID declaration.

parent eba6b38b
...@@ -47,10 +47,6 @@ ...@@ -47,10 +47,6 @@
#define ELF_INFO_MODULE 0x0002 #define ELF_INFO_MODULE 0x0002
#define ELF_INFO_NAME 0x0004 #define ELF_INFO_NAME 0x0004
#ifndef NT_GNU_BUILD_ID
#define NT_GNU_BUILD_ID 3
#endif
#ifndef HAVE_STRUCT_R_DEBUG #ifndef HAVE_STRUCT_R_DEBUG
struct r_debug struct r_debug
{ {
......
...@@ -54,10 +54,6 @@ ...@@ -54,10 +54,6 @@
#endif #endif
#endif #endif
#ifndef NT_GNU_BUILD_ID
#define NT_GNU_BUILD_ID 3
#endif
/* structure holding information while handling an ELF image /* structure holding information while handling an ELF image
* allows one by one section mapping for memory savings * allows one by one section mapping for memory savings
*/ */
......
...@@ -34,6 +34,8 @@ ...@@ -34,6 +34,8 @@
WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DEFAULT_DEBUG_CHANNEL(dbghelp);
#define NOTE_GNU_BUILD_ID 3
const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'}; const WCHAR S_ElfW[] = {'<','e','l','f','>','\0'};
const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'}; const WCHAR S_WineLoaderW[] = {'<','w','i','n','e','-','l','o','a','d','e','r','>','\0'};
static const WCHAR S_DotSoW[] = {'.','s','o','\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 ...@@ -640,7 +642,7 @@ static BOOL image_locate_build_id_target(struct image_file_map* fmap, const BYTE
if (note != IMAGE_NO_MAP) if (note != IMAGE_NO_MAP)
{ {
/* the usual ELF note structure: name-size desc-size type <name> <desc> */ /* 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 && if (note[1] == idlen &&
!memcmp(note + 3 + ((note[0] + 3) >> 2), idend - idlen, 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 ...@@ -686,7 +688,7 @@ BOOL image_check_alternate(struct image_file_map* fmap, const struct module* mod
if (note != IMAGE_NO_MAP) if (note != IMAGE_NO_MAP)
{ {
/* the usual ELF note structure: name-size desc-size type <name> <desc> */ /* 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]); ret = image_locate_build_id_target(fmap, (const BYTE*)(note + 3 + ((note[0] + 3) >> 2)), note[1]);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment