diff options
| author | Mark Wielaard <mark@klomp.org> | 2023-02-06 10:21:58 +0100 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2023-02-06 10:21:58 +0100 |
| commit | 45576ab5f24cd39669a418fa8e005b4d04f8e9ca (patch) | |
| tree | b08627ab8372ac5d0c3444a2180c689715a8d596 | |
| parent | dd3c621ff36f73cb26d89a2fd5ea384a5b33334c (diff) | |
| download | elfutils-45576ab5f24cd39669a418fa8e005b4d04f8e9ca.tar.gz | |
debuginfod: Make sure there is only one typedef for debuginfod_client
Both debuginfod.h and libdwfl.h have a simple typedef for struct
debuginfod_client. Some compilers pedantically warn when including
both headers that such typedefs are only officially supported in
C11. So guard them with _ELFUTILS_DEBUGINFOD_CLIENT_TYPEDEF to
make them happy.
https://sourceware.org/bugzilla/show_bug.cgi?id=30077
Signed-off-by: Mark Wielaard <mark@klomp.org>
| -rw-r--r-- | debuginfod/ChangeLog | 5 | ||||
| -rw-r--r-- | debuginfod/debuginfod.h.in | 3 | ||||
| -rw-r--r-- | libdwfl/ChangeLog | 5 | ||||
| -rw-r--r-- | libdwfl/libdwfl.h | 3 |
4 files changed, 16 insertions, 0 deletions
diff --git a/debuginfod/ChangeLog b/debuginfod/ChangeLog index fc44e039..fe368c48 100644 --- a/debuginfod/ChangeLog +++ b/debuginfod/ChangeLog @@ -1,3 +1,8 @@ +2023-02-06 Mark Wielaard <mark@klomp.org> + + * debuginfod.h.in: Guard debuginfod_client typedef with + _ELFUTILS_DEBUGINFOD_CLIENT_TYPEDEF. + 2023-01-10 Mark Wielaard <mark@klomp.org> * debuginfod-client.c (debuginfod_query_server): Use diff --git a/debuginfod/debuginfod.h.in b/debuginfod/debuginfod.h.in index 69c9efd2..4a256ba9 100644 --- a/debuginfod/debuginfod.h.in +++ b/debuginfod/debuginfod.h.in @@ -44,7 +44,10 @@ #define DEBUGINFOD_SONAME "@LIBDEBUGINFOD_SONAME@" /* Handle for debuginfod-client connection. */ +#ifndef _ELFUTILS_DEBUGINFOD_CLIENT_TYPEDEF typedef struct debuginfod_client debuginfod_client; +#define _ELFUTILS_DEBUGINFOD_CLIENT_TYPEDEF 1 +#endif #ifdef __cplusplus extern "C" { diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index 9cd2f03c..daef2828 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,8 @@ +2023-02-06 Mark Wielaard <mark@klomp.org> + + * libdwfl.h: Guard debuginfod_client typedef with + _ELFUTILS_DEBUGINFOD_CLIENT_TYPEDEF. + 2022-12-21 Mark Wielaard <mark@klomp.org> * core-file.c: Don't undef _. diff --git a/libdwfl/libdwfl.h b/libdwfl/libdwfl.h index 9114f7f0..49ad6664 100644 --- a/libdwfl/libdwfl.h +++ b/libdwfl/libdwfl.h @@ -50,7 +50,10 @@ typedef struct Dwfl_Thread Dwfl_Thread; typedef struct Dwfl_Frame Dwfl_Frame; /* Handle for debuginfod-client connection. */ +#ifndef _ELFUTILS_DEBUGINFOD_CLIENT_TYPEDEF typedef struct debuginfod_client debuginfod_client; +#define _ELFUTILS_DEBUGINFOD_CLIENT_TYPEDEF 1 +#endif /* Callbacks. */ typedef struct |