[PATCH 4/7] dbghelp: Move elf_check_alternate implementation to module.c.

[Jacek Caban]

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
  dlls/dbghelp/elf_module.c    | 247 +----------------------------------
  dlls/dbghelp/image_private.h |   4 +
  dlls/dbghelp/module.c        | 239 +++++++++++++++++++++++++++++++++
  3 files changed, 250 insertions(+), 240 deletions(-)

[Alexandre Julliard]

Jacek Caban <jacek(a)codeweavers.com> writes:
> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
> ---
>  dlls/dbghelp/elf_module.c    | 247 +----------------------------------
>  dlls/dbghelp/image_private.h |   4 +
>  dlls/dbghelp/module.c        | 239 +++++++++++++++++++++++++++++++++
>  3 files changed, 250 insertions(+), 240 deletions(-)

This breaks the Windows build:

i686-w64-mingw32-gcc -c -o module.o ../../../wine/dlls/dbghelp/module.c -I. -I../../../wine/dlls/dbghelp -I../../include \
  -I../../../wine/include -I/home/julliard/cloud/wine/zlib-win32/include -D__WINESRC__ \
  -D_IMAGEHLP_SOURCE_ -D_REENTRANT -Wall -pipe -fcf-protection=none -fno-stack-protector \
  -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \
  -Wno-packed-not-aligned -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits \
  -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 \
  -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -fno-diagnostics-show-caret -D_WIN32
../../../wine/dlls/dbghelp/module.c: In function ‘image_locate_build_id_target’:
../../../wine/dlls/dbghelp/module.c:694:19: error: unknown type name ‘uint32_t’
../../../wine/dlls/dbghelp/module.c:696:27: error: unknown type name ‘uint32_t’
../../../wine/dlls/dbghelp/module.c:700:32: error: ‘NT_GNU_BUILD_ID’ undeclared (first use in this function)
../../../wine/dlls/dbghelp/module.c:700:32: note: each undeclared identifier is reported only once for each function it appears in
../../../wine/dlls/dbghelp/module.c: In function ‘image_check_alternate’:
../../../wine/dlls/dbghelp/module.c:739:15: error: unknown type name ‘uint32_t’
../../../wine/dlls/dbghelp/module.c:742:23: error: unknown type name ‘uint32_t’
../../../wine/dlls/dbghelp/module.c:746:28: error: ‘NT_GNU_BUILD_ID’ undeclared (first use in this function)
make: *** [Makefile:671: module.o] Error 1

-- 
Alexandre Julliard
julliard(a)winehq.org

[Jacek Caban]

On 17.03.2020 19:45, Alexandre Julliard wrote:
> Jacek Caban <jacek(a)codeweavers.com> writes:
> > Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
> > ---
> >   dlls/dbghelp/elf_module.c    | 247 +----------------------------------
> >   dlls/dbghelp/image_private.h |   4 +
> >   dlls/dbghelp/module.c        | 239 +++++++++++++++++++++++++++++++++
> >   3 files changed, 250 insertions(+), 240 deletions(-)
> > This breaks the Windows build:
>
> i686-w64-mingw32-gcc -c -o module.o ../../../wine/dlls/dbghelp/module.c -I. -I../../../wine/dlls/dbghelp -I../../include \
>    -I../../../wine/include -I/home/julliard/cloud/wine/zlib-win32/include -D__WINESRC__ \
>    -D_IMAGEHLP_SOURCE_ -D_REENTRANT -Wall -pipe -fcf-protection=none -fno-stack-protector \
>    -fno-strict-aliasing -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers \
>    -Wno-packed-not-aligned -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits \
>    -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith -Wlogical-op -gdwarf-2 \
>    -gstrict-dwarf -fno-omit-frame-pointer -g -O2 -fno-diagnostics-show-caret -D_WIN32
> ../../../wine/dlls/dbghelp/module.c: In function ‘image_locate_build_id_target’:
> ../../../wine/dlls/dbghelp/module.c:694:19: error: unknown type name ‘uint32_t’
> ../../../wine/dlls/dbghelp/module.c:696:27: error: unknown type name ‘uint32_t’
> ../../../wine/dlls/dbghelp/module.c:700:32: error: ‘NT_GNU_BUILD_ID’ undeclared (first use in this function)
> ../../../wine/dlls/dbghelp/module.c:700:32: note: each undeclared identifier is reported only once for each function it appears in
> ../../../wine/dlls/dbghelp/module.c: In function ‘image_check_alternate’:
> ../../../wine/dlls/dbghelp/module.c:739:15: error: unknown type name ‘uint32_t’
> ../../../wine/dlls/dbghelp/module.c:742:23: error: unknown type name ‘uint32_t’
> ../../../wine/dlls/dbghelp/module.c:746:28: error: ‘NT_GNU_BUILD_ID’ undeclared (first use in this function)
> make: *** [Makefile:671: module.o] Error 1

Sorry about that, I sent a fixed version.


Thanks,

Jacek