Skip to content

Commit fc55345

Browse files
committed
- Fix mini_event.h on OpenBSD cannot find fd_set.
1 parent e855d57 commit fc55345

5 files changed

Lines changed: 12 additions & 2 deletions

File tree

config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -573,6 +573,9 @@
573573
/* Define to 1 if you have the <sys/resource.h> header file. */
574574
#undef HAVE_SYS_RESOURCE_H
575575

576+
/* Define to 1 if you have the <sys/select.h> header file. */
577+
#undef HAVE_SYS_SELECT_H
578+
576579
/* Define to 1 if you have the <sys/sha2.h> header file. */
577580
#undef HAVE_SYS_SHA2_H
578581

configure

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14726,7 +14726,7 @@ $as_echo "no" >&6; }
1472614726
fi
1472714727

1472814728
# Checks for header files.
14729-
for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h
14729+
for ac_header in stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h
1473014730
do :
1473114731
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
1473214732
ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ ACX_LIBTOOL_C_ONLY
399399
PKG_PROG_PKG_CONFIG
400400

401401
# Checks for header files.
402-
AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h],,, [AC_INCLUDES_DEFAULT])
402+
AC_CHECK_HEADERS([stdarg.h stdbool.h netinet/in.h netinet/tcp.h sys/param.h sys/select.h sys/socket.h sys/un.h sys/uio.h sys/resource.h arpa/inet.h syslog.h netdb.h sys/wait.h pwd.h glob.h grp.h login_cap.h winsock2.h ws2tcpip.h endian.h sys/endian.h libkern/OSByteOrder.h sys/ipc.h sys/shm.h],,, [AC_INCLUDES_DEFAULT])
403403

404404
# Check for Apple header. This uncovers TARGET_OS_IPHONE, TARGET_OS_TV or TARGET_OS_WATCH
405405
AC_CHECK_HEADERS([TargetConditionals.h])

doc/Changelog

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
4 August 2020: Wouter
2+
- Fix mini_event.h on OpenBSD cannot find fd_set.
3+
14
31 July 2020: Wouter
25
- Fix doxygen comment for no ssl for tls session ticket key callback
36
routine.

util/mini_event.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,10 @@
5454

5555
#if defined(USE_MINI_EVENT) && !defined(USE_WINSOCK)
5656

57+
#ifdef HAVE_SYS_SELECT_H
58+
/* for fd_set on OpenBSD */
59+
#include <sys/select.h>
60+
#endif
5761
#include <sys/time.h>
5862

5963
#ifndef HAVE_EVENT_BASE_FREE

0 commit comments

Comments
 (0)