commit bd1111692a6c993c4222e252283eeaefc804a68a parent 34275b5588506d5a93bf62885fbe956636cc4b9e Author: Christian Grothoff <christian@grothoff.org> Date: Sat, 20 Dec 2025 10:59:35 +0100 try again to avoid double-definition problem Diffstat:
| M | src/incl_priv/mhd_sys_options.h | | | 6 | ++++++ |
| M | src/mhd2/mhd_str.h | | | 4 | ---- |
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/incl_priv/mhd_sys_options.h b/src/incl_priv/mhd_sys_options.h @@ -52,6 +52,10 @@ #ifndef MHD_SYS_OPTIONS_H #define MHD_SYS_OPTIONS_H 1 +// FIXME-Evgeny: both of these headers define some of the +// very same MHD-macros. We should avoid this. +#ifndef MICROHTTPD2_PORTABILITY_H + #ifndef HAVE_CONFIG_H # ifndef _MSC_VER @@ -683,4 +687,6 @@ # undef HAVE_CONFIG_H #endif +#endif /* MICROHTTPD2_PORTABILITY_H */ + #endif /* MHD_SYS_OPTIONS_H */ diff --git a/src/mhd2/mhd_str.h b/src/mhd2/mhd_str.h @@ -45,11 +45,7 @@ #ifndef MHD_STR_H #define MHD_STR_H 1 -// FIXME-Evgeny: both of these headers define some of the -// very same MHD-macros. We should avoid this. -#ifndef MICROHTTPD2_PORTABILITY_H #include "mhd_sys_options.h" -#endif #include "sys_base_types.h" #include "sys_bool_type.h"