libmicrohttpd2

commit 13b5e633e115964074fd60d38e0bcb9675b0bb03
parent ddd0d48e0180f1752111792bdcf3bf6f6192310b
Author: Evgeny Grin (Karlson2k) <k2k@drgrin.dev>
Date:   Sun, 21 Dec 2025 21:50:35 +0100

Revert "try again to avoid double-definition problem"

This reverts commit bd1111692a6c993c4222e252283eeaefc804a68a.

Diffstat:
M
src/incl_priv/mhd_sys_options.h
 | 
6
------
M
src/mhd2/mhd_str.h
 | 
4
++++

2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/src/incl_priv/mhd_sys_options.h b/src/incl_priv/mhd_sys_options.h
@@ -52,10 +52,6 @@
 
 #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
@@ -687,6 +683,4 @@
 #  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,7 +45,11 @@
 #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"