diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-02-20 13:42:19 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-02-20 13:45:27 -0800 |
| commit | 630da78a3cc2a5df2d61e1edf0c209b806b336e2 (patch) | |
| tree | 733a99c301158e849bc3f612f6eb896e55ad47a8 /m4 | |
| parent | 3d38ab8f1fbfaeb1f3eddbc79ef6ded1d9a87841 (diff) | |
| download | emacs-630da78a3cc2a5df2d61e1edf0c209b806b336e2.tar.gz | |
Update from gnulib
This includes:
2018-02-18 warnings: Add support for Objective C
2018-02-03 stdlib: Fix compilation error on OpenIndiana
* lib/gnulib.mk.in: Regenerate.
* lib/stdlib.in.h, m4/getloadavg.m4, m4/stdlib_h.m4, m4/warnings.m4:
Copy from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/getloadavg.m4 | 5 | ||||
| -rw-r--r-- | m4/stdlib_h.m4 | 5 | ||||
| -rw-r--r-- | m4/warnings.m4 | 11 |
3 files changed, 18 insertions, 3 deletions
diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index acc266531ed..7b6a09a5c5b 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -7,7 +7,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 6 +#serial 7 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -92,6 +92,9 @@ else fi AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0], [[#if HAVE_SYS_LOADAVG_H + /* OpenIndiana has a bug: <sys/time.h> must be included before + <sys/loadavg.h>. */ + # include <sys/time.h> # include <sys/loadavg.h> #endif #include <stdlib.h>]]) diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index eff6f9e685b..49dc5d59cbe 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,4 +1,4 @@ -# stdlib_h.m4 serial 44 +# stdlib_h.m4 serial 45 dnl Copyright (C) 2007-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -14,6 +14,9 @@ AC_DEFUN([gl_STDLIB_H], dnl guaranteed by C89. gl_WARN_ON_USE_PREPARE([[#include <stdlib.h> #if HAVE_SYS_LOADAVG_H +/* OpenIndiana has a bug: <sys/time.h> must be included before + <sys/loadavg.h>. */ +# include <sys/time.h> # include <sys/loadavg.h> #endif #if HAVE_RANDOM_H diff --git a/m4/warnings.m4 b/m4/warnings.m4 index eb1c795c598..07edda1cca6 100644 --- a/m4/warnings.m4 +++ b/m4/warnings.m4 @@ -1,4 +1,4 @@ -# warnings.m4 serial 13 +# warnings.m4 serial 14 dnl Copyright (C) 2008-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -76,6 +76,15 @@ m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(C++)], AC_LANG_POP([C++]) ]) +# Specialization for _AC_LANG = Objective C. This macro can be AC_REQUIREd. +# Use of m4_defun rather than AC_DEFUN works around a bug in autoconf < 2.63b. +m4_defun([gl_UNKNOWN_WARNINGS_ARE_ERRORS(Objective C)], +[ + AC_LANG_PUSH([Objective C]) + gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL + AC_LANG_POP([Objective C]) +]) + AC_DEFUN([gl_UNKNOWN_WARNINGS_ARE_ERRORS_IMPL], [gl_COMPILER_OPTION_IF([-Werror -Wunknown-warning-option], [gl_unknown_warnings_are_errors='-Wunknown-warning-option -Werror'], |