1 files changed, 12 insertions, 12 deletions

diff --git a/src/microhttpd/internal.h b/src/microhttpd/internal.h
index adcc43da..3ccc7347 100644
--- a/src/microhttpd/internal.h
+++ b/src/microhttpd/internal.h
@@ -153,55 +153,55 @@
 /**
  * Checks whether the @a d daemon is using select()
  */
-#define MHD_D_USING_SELECT_(d) \
+#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_USING_POLL_(d) (0 != (d->options & MHD_USE_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_USING_EPOLL_(d) (0 != (d->options & MHD_USE_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_USING_SELECT_(d) (0 == (d->options & MHD_USE_POLL))
+#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_USING_POLL_(d) (0 != (d->options & MHD_USE_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_USING_EPOLL_(d) (0)
+#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_USING_SELECT_(d) (0 == (d->options & MHD_USE_EPOLL))
+#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_USING_POLL_(d) (0)
+#define MHD_D_IS_USING_POLL_(d) ((void) (d), 0)
 /**
  * Checks whether the @a d daemon is using epoll
  */
-#define MHD_D_USING_EPOLL_(d) (0 != (d->options & MHD_USE_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_USING_SELECT_(d) (! 0)
+#define MHD_D_IS_USING_SELECT_(d) ((void) (d), ! 0)
 /**
  * Checks whether the @a d daemon is using poll()
  */
-#define MHD_D_USING_POLL_(d) (0)
+#define MHD_D_IS_USING_POLL_(d) ((void) (d), 0)
 /**
  * Checks whether the @a d daemon is using epoll
  */
-#define MHD_D_USING_EPOLL_(d) (0)
+#define MHD_D_IS_USING_EPOLL_(d) ((void) (d), 0)
 #endif /* select() only */
 
 /**