X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fioctl.m4;h=5a31a396f97f89ef56a273cc724d629c7d6cf2ea;hb=7ef6c64e210ac0979d7e8ac69bc5b5208c2405ab;hp=4a0a99f16a7a127deb2f0c62355527b0bacbed6c;hpb=e7f1d9f02bf4b66422c557326cf8483d8e12631d;p=gnulib.git diff --git a/m4/ioctl.m4 b/m4/ioctl.m4 index 4a0a99f16..5a31a396f 100644 --- a/m4/ioctl.m4 +++ b/m4/ioctl.m4 @@ -1,5 +1,5 @@ -# ioctl.m4 serial 1 -dnl Copyright (C) 2008-2010 Free Software Foundation, Inc. +# ioctl.m4 serial 4 +dnl Copyright (C) 2008-2014 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -8,12 +8,12 @@ AC_DEFUN([gl_FUNC_IOCTL], [ AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS]) AC_REQUIRE([gl_HEADER_SYS_SOCKET]) + HAVE_IOCTL=1 if test "$ac_cv_header_winsock2_h" = yes; then dnl Even if the 'socket' module is not used here, another part of the dnl application may use it and pass file descriptors that refer to dnl sockets to the ioctl() function. So enable the support for sockets. - AC_LIBOBJ([ioctl]) - gl_REPLACE_SYS_IOCTL_H + HAVE_IOCTL=0 else AC_CHECK_FUNCS([ioctl]) dnl On glibc systems, the second parameter is 'unsigned long int request', @@ -24,15 +24,18 @@ AC_DEFUN([gl_FUNC_IOCTL], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include ]], - [[extern int ioctl (int, int, ...);]]) + [[extern + #ifdef __cplusplus + "C" + #endif + int ioctl (int, int, ...); + ]]) ], [gl_cv_func_ioctl_posix_signature=yes], [gl_cv_func_ioctl_posix_signature=no]) ]) if test $gl_cv_func_ioctl_posix_signature != yes; then REPLACE_IOCTL=1 - AC_LIBOBJ([ioctl]) - gl_REPLACE_SYS_IOCTL_H fi fi ])