Skip to content

Commit

Permalink
under Mac OS X, sendfile(2) requires sys/socket.h & sys/uio.h
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Sep 29, 2020
1 parent ec6247d commit 3417f41
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions configure
Expand Up @@ -4561,7 +4561,7 @@ MAGICK_PATCHLEVEL_VERSION=32

MAGICK_VERSION=6.9.11-32

MAGICK_GIT_REVISION=15921:7847ad540:20200927
MAGICK_GIT_REVISION=15923:ec6247db0:20200929


# Substitute library versioning
Expand Down Expand Up @@ -22894,7 +22894,7 @@ fi


# Check additional headers
for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h utime.h wchar.h xlocale.h
for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/uio.h sys/wait.h utime.h wchar.h xlocale.h
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
Expand Down
2 changes: 1 addition & 1 deletion configure.ac
Expand Up @@ -959,7 +959,7 @@ AC_HEADER_ASSERT
AC_HEADER_DIRENT

# Check additional headers
AC_CHECK_HEADERS(arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/wait.h utime.h wchar.h xlocale.h)
AC_CHECK_HEADERS(arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/uio.h sys/wait.h utime.h wchar.h xlocale.h)

########
#
Expand Down
6 changes: 6 additions & 0 deletions magick/studio.h
Expand Up @@ -221,6 +221,12 @@ extern int vsnprintf(char *,size_t,const char *,va_list);
# if defined(MAGICKCORE_HAVE_SYS_SENDFILE_H)
# include <sys/sendfile.h>
# endif
# if defined(MAGICKCORE_HAVE_SYS_SOCKET_H)
# include <sys/socket.h>
# endif
# if defined(MAGICKCORE_HAVE_SYS_UIO_H)
# include <sys/uio.h>
# endif
#endif
#else
# include <types.h>
Expand Down

0 comments on commit 3417f41

Please sign in to comment.