X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fnanosleep.m4;h=a633321a8f7ce1f76fc82b6bb4674e3fd25e0e3b;hb=062cad2d07081f9a60adbb90fc1184a435a1a93f;hp=211b367a016bfb0636a1ab7cc5d4b00134f8e883;hpb=a905b35027f406a031a844995b32b7b9291d0336;p=gnulib.git diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index 211b367a0..a633321a8 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,11 +1,11 @@ -# serial 29 +# serial 30 dnl From Jim Meyering. dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999-2001, 2003-2009 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2010 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -18,6 +18,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) AC_CHECK_HEADERS_ONCE([sys/time.h]) + AC_REQUIRE([gl_FUNC_SELECT]) nanosleep_save_libs=$LIBS @@ -43,51 +44,51 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], [ AC_RUN_IFELSE( [AC_LANG_SOURCE([[ - #include - #include - #include - #if HAVE_SYS_TIME_H - #include - #endif - #include - #include - #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) - #define TYPE_MAXIMUM(t) \ - ((t) (! TYPE_SIGNED (t) \ - ? (t) -1 \ - : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) + #include + #include + #include + #if HAVE_SYS_TIME_H + #include + #endif + #include + #include + #define TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) + #define TYPE_MAXIMUM(t) \ + ((t) (! TYPE_SIGNED (t) \ + ? (t) -1 \ + : ~ (~ (t) 0 << (sizeof (t) * CHAR_BIT - 1)))) - static void - check_for_SIGALRM (int sig) - { - if (sig != SIGALRM) - _exit (1); - } + static void + check_for_SIGALRM (int sig) + { + if (sig != SIGALRM) + _exit (1); + } - int - main () - { - static struct timespec ts_sleep; - static struct timespec ts_remaining; - static struct sigaction act; - if (! nanosleep) - return 1; - act.sa_handler = check_for_SIGALRM; - sigemptyset (&act.sa_mask); - sigaction (SIGALRM, &act, NULL); - ts_sleep.tv_sec = 0; - ts_sleep.tv_nsec = 1; - alarm (1); - if (nanosleep (&ts_sleep, NULL) != 0) - return 1; - ts_sleep.tv_sec = TYPE_MAXIMUM (time_t); - ts_sleep.tv_nsec = 999999999; - alarm (1); - if (nanosleep (&ts_sleep, &ts_remaining) == -1 && errno == EINTR - && TYPE_MAXIMUM (time_t) - 10 < ts_remaining.tv_sec) - return 0; - return 119; - }]])], + int + main () + { + static struct timespec ts_sleep; + static struct timespec ts_remaining; + static struct sigaction act; + if (! nanosleep) + return 1; + act.sa_handler = check_for_SIGALRM; + sigemptyset (&act.sa_mask); + sigaction (SIGALRM, &act, NULL); + ts_sleep.tv_sec = 0; + ts_sleep.tv_nsec = 1; + alarm (1); + if (nanosleep (&ts_sleep, NULL) != 0) + return 1; + ts_sleep.tv_sec = TYPE_MAXIMUM (time_t); + ts_sleep.tv_nsec = 999999999; + alarm (1); + if (nanosleep (&ts_sleep, &ts_remaining) == -1 && errno == EINTR + && TYPE_MAXIMUM (time_t) - 10 < ts_remaining.tv_sec) + return 0; + return 119; + }]])], [gl_cv_func_nanosleep=yes], [case $? in dnl ( 119) gl_cv_func_nanosleep='no (mishandles large arguments)';; dnl ( @@ -101,7 +102,14 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], REPLACE_NANOSLEEP=1 if test "$gl_cv_func_nanosleep" = 'no (mishandles large arguments)'; then AC_DEFINE([HAVE_BUG_BIG_NANOSLEEP], [1], - [Define to 1 if nanosleep mishandles large arguments.]) + [Define to 1 if nanosleep mishandles large arguments.]) + else + for ac_lib in $LIBSOCKET; do + case " $LIB_NANOSLEEP " in + *" $ac_lib "*) ;; + *) LIB_NANOSLEEP="$LIB_NANOSLEEP $ac_lib";; + esac + done fi AC_LIBOBJ([nanosleep]) gl_PREREQ_NANOSLEEP