>From 0b66ae8c0d0f28fe0e33b883f4ef1e60c0067fbb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Jan 2024 10:25:46 +0100 Subject: [PATCH] Fix a compilation error due to two typedefs of the same type. * libpoke/libpoke.h (pk_compiler): Don't define if already defined. * poke/pk-term.h (pk_compiler): Likewise. --- libpoke/libpoke.h | 3 +++ poke/pk-term.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/libpoke/libpoke.h b/libpoke/libpoke.h index baee3b91..65d318d3 100644 --- a/libpoke/libpoke.h +++ b/libpoke/libpoke.h @@ -36,7 +36,10 @@ #define LIBPOKE_NONNULL(...) #endif +#ifndef PK_COMPILER_DEFINED typedef struct _pk_compiler *pk_compiler; +# define PK_COMPILER_DEFINED 1 +#endif typedef struct _pk_ios *pk_ios; typedef uint64_t pk_val; diff --git a/poke/pk-term.h b/poke/pk-term.h index 57274d4f..227378d6 100644 --- a/poke/pk-term.h +++ b/poke/pk-term.h @@ -24,7 +24,10 @@ #include /* From libpoke.h. */ +#ifndef PK_COMPILER_DEFINED typedef struct _pk_compiler *pk_compiler; +# define PK_COMPILER_DEFINED 1 +#endif /* Defined in poke.c. */ extern pk_compiler poke_compiler; -- 2.34.1