diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-19 16:31:24 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-08-19 16:31:24 -0700 |
commit | 562d4436bce90adc8535aeb2b9b1517952ee67ad (patch) | |
tree | 5f0e3326cb58d26d69af7e30714ecf4c13d88f73 /m4/mktime.m4 | |
parent | b69a6d228467365b4ed2545dcb1ecc3582d20e2a (diff) | |
download | emacs-562d4436bce90adc8535aeb2b9b1517952ee67ad.tar.gz |
Merge from gnulib.
2012-08-19 ignore-value, stat-time, timespec: omit AC_C_INLINE
2012-08-19 mktime, sys_select: avoid 'static inline'
2012-08-19 gnulib-tool: Fix indentation.
Diffstat (limited to 'm4/mktime.m4')
-rw-r--r-- | m4/mktime.m4 | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 00ee2dabea5..f509bc4da07 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -# serial 23 +# serial 24 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2012 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -247,7 +247,4 @@ AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [ ]) # Prerequisites of lib/mktime.c. -AC_DEFUN([gl_PREREQ_MKTIME], -[ - AC_REQUIRE([AC_C_INLINE]) -]) +AC_DEFUN([gl_PREREQ_MKTIME], [:]) |