libmicrohttpd

HTTP/1.x server C library (MHD 1.x, stable)
Log | Files | Refs | Submodules | README | LICENSE

commit b4401abfb7f16501168ed5ba68e241572a7c2b35
parent 0813a8b2a0d4341387ba15bababe3c32c808c4de
Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
Date:   Mon,  6 Nov 2023 19:03:50 +0300

internal.h: moved some macros

This is a correction for a225047802d49add197983055005f55559d7b47f

Diffstat:
Msrc/microhttpd/internal.h | 110++++++++++++++++++++++++++++++++++++++++----------------------------------------
1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h @@ -149,61 +149,6 @@ #endif /* ! MHD_STATICSTR_LEN_ */ -#if defined(HAVE_POLL) && defined(EPOLL_SUPPORT) -/** - * Checks whether the @a d daemon is using select() - */ -#define MHD_D_IS_USING_SELECT_(d) \ - (0 == (d->options & (MHD_USE_POLL | MHD_USE_EPOLL))) -/** - * Checks whether the @a d daemon is using poll() - */ -#define MHD_D_IS_USING_POLL_(d) (0 != ((d)->options & MHD_USE_POLL)) -/** - * Checks whether the @a d daemon is using epoll - */ -#define MHD_D_IS_USING_EPOLL_(d) (0 != ((d)->options & MHD_USE_EPOLL)) -#elif defined(HAVE_POLL) -/** - * Checks whether the @a d daemon is using select() - */ -#define MHD_D_IS_USING_SELECT_(d) (0 == ((d)->options & MHD_USE_POLL)) -/** - * Checks whether the @a d daemon is using poll() - */ -#define MHD_D_IS_USING_POLL_(d) (0 != ((d)->options & MHD_USE_POLL)) -/** - * Checks whether the @a d daemon is using epoll - */ -#define MHD_D_IS_USING_EPOLL_(d) ((void) (d), 0) -#elif defined(EPOLL_SUPPORT) -/** - * Checks whether the @a d daemon is using select() - */ -#define MHD_D_IS_USING_SELECT_(d) (0 == ((d)->options & MHD_USE_EPOLL)) -/** - * Checks whether the @a d daemon is using poll() - */ -#define MHD_D_IS_USING_POLL_(d) ((void) (d), 0) -/** - * Checks whether the @a d daemon is using epoll - */ -#define MHD_D_IS_USING_EPOLL_(d) (0 != ((d)->options & MHD_USE_EPOLL)) -#else /* select() only */ -/** - * Checks whether the @a d daemon is using select() - */ -#define MHD_D_IS_USING_SELECT_(d) ((void) (d), ! 0) -/** - * Checks whether the @a d daemon is using poll() - */ -#define MHD_D_IS_USING_POLL_(d) ((void) (d), 0) -/** - * Checks whether the @a d daemon is using epoll - */ -#define MHD_D_IS_USING_EPOLL_(d) ((void) (d), 0) -#endif /* select() only */ - /** * Tri-state on/off/unknown */ @@ -2533,6 +2478,61 @@ struct MHD_Daemon }; +#if defined(HAVE_POLL) && defined(EPOLL_SUPPORT) +/** + * Checks whether the @a d daemon is using select() + */ +#define MHD_D_IS_USING_SELECT_(d) \ + (0 == (d->options & (MHD_USE_POLL | MHD_USE_EPOLL))) +/** + * Checks whether the @a d daemon is using poll() + */ +#define MHD_D_IS_USING_POLL_(d) (0 != ((d)->options & MHD_USE_POLL)) +/** + * Checks whether the @a d daemon is using epoll + */ +#define MHD_D_IS_USING_EPOLL_(d) (0 != ((d)->options & MHD_USE_EPOLL)) +#elif defined(HAVE_POLL) +/** + * Checks whether the @a d daemon is using select() + */ +#define MHD_D_IS_USING_SELECT_(d) (0 == ((d)->options & MHD_USE_POLL)) +/** + * Checks whether the @a d daemon is using poll() + */ +#define MHD_D_IS_USING_POLL_(d) (0 != ((d)->options & MHD_USE_POLL)) +/** + * Checks whether the @a d daemon is using epoll + */ +#define MHD_D_IS_USING_EPOLL_(d) ((void) (d), 0) +#elif defined(EPOLL_SUPPORT) +/** + * Checks whether the @a d daemon is using select() + */ +#define MHD_D_IS_USING_SELECT_(d) (0 == ((d)->options & MHD_USE_EPOLL)) +/** + * Checks whether the @a d daemon is using poll() + */ +#define MHD_D_IS_USING_POLL_(d) ((void) (d), 0) +/** + * Checks whether the @a d daemon is using epoll + */ +#define MHD_D_IS_USING_EPOLL_(d) (0 != ((d)->options & MHD_USE_EPOLL)) +#else /* select() only */ +/** + * Checks whether the @a d daemon is using select() + */ +#define MHD_D_IS_USING_SELECT_(d) ((void) (d), ! 0) +/** + * Checks whether the @a d daemon is using poll() + */ +#define MHD_D_IS_USING_POLL_(d) ((void) (d), 0) +/** + * Checks whether the @a d daemon is using epoll + */ +#define MHD_D_IS_USING_EPOLL_(d) ((void) (d), 0) +#endif /* select() only */ + #ifdef DAUTH_SUPPORT /**