mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-12-25 10:47:00 +00:00
68a256c892
Make the following changes by hand, and run 'admin/merge-gnulib'. * .gitignore: Add lib/malloc/*.gl.h. * admin/merge-gnulib: Copy lib/af_alg.h and lib/save-cwd.h directly from Gnulib, without worrying about Gnulib modules, as these files are special cases. (AVOIDED_MODULES): Remove malloc-posix. * lib/malloc.c, lib/realloc.c, m4/malloc.m4, m4/realloc.m4: * m4/year2038.m4: New files, copied from Gnulib. * lib/malloca.c, lib/malloca.h: * m4/close-stream.m4, m4/glibc21.m4, m4/malloca.m4: Remove. These are either no longer present in Gnulib, or are no longer needed by modules that Emacs uses. * oldXMenu/AddPane.c, oldXmenu/Addsel.c: Include XmenuInt.h first; needed for new Gnulib. * src/xmenu.c: Call emacs_abort, not abort.
70 lines
2.7 KiB
Plaintext
70 lines
2.7 KiB
Plaintext
# serial 29
|
|
|
|
# Copyright (C) 2001-2003, 2005, 2007, 2009-2021 Free Software Foundation, Inc.
|
|
# This file is free software; the Free Software Foundation
|
|
# gives unlimited permission to copy and/or distribute it,
|
|
# with or without modifications, as long as this notice is preserved.
|
|
|
|
dnl From Jim Meyering.
|
|
|
|
AC_DEFUN([gl_FUNC_GETTIMEOFDAY],
|
|
[
|
|
AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS])
|
|
AC_REQUIRE([AC_C_RESTRICT])
|
|
AC_REQUIRE([AC_CANONICAL_HOST])
|
|
AC_REQUIRE([gl_SYS_TIME_H])
|
|
AC_CHECK_FUNCS_ONCE([gettimeofday])
|
|
|
|
gl_gettimeofday_timezone=void
|
|
if test $ac_cv_func_gettimeofday != yes; then
|
|
HAVE_GETTIMEOFDAY=0
|
|
else
|
|
AC_CACHE_CHECK([for gettimeofday with POSIX signature],
|
|
[gl_cv_func_gettimeofday_posix_signature],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <sys/time.h>
|
|
struct timeval c;
|
|
int gettimeofday (struct timeval *restrict, void *restrict);
|
|
]],
|
|
[[/* glibc uses struct timezone * rather than the POSIX void *
|
|
if _GNU_SOURCE is defined. However, since the only portable
|
|
use of gettimeofday uses NULL as the second parameter, and
|
|
since the glibc definition is actually more typesafe, it is
|
|
not worth wrapping this to get a compliant signature. */
|
|
int (*f) (struct timeval *restrict, void *restrict)
|
|
= gettimeofday;
|
|
int x = f (&c, 0);
|
|
return !(x | c.tv_sec | c.tv_usec);
|
|
]])],
|
|
[gl_cv_func_gettimeofday_posix_signature=yes],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#include <sys/time.h>
|
|
int gettimeofday (struct timeval *restrict, struct timezone *restrict);
|
|
]])],
|
|
[gl_cv_func_gettimeofday_posix_signature=almost],
|
|
[gl_cv_func_gettimeofday_posix_signature=no])])])
|
|
if test $gl_cv_func_gettimeofday_posix_signature = almost; then
|
|
gl_gettimeofday_timezone='struct timezone'
|
|
elif test $gl_cv_func_gettimeofday_posix_signature != yes; then
|
|
REPLACE_GETTIMEOFDAY=1
|
|
fi
|
|
dnl If we override 'struct timeval', we also have to override gettimeofday.
|
|
if test $REPLACE_STRUCT_TIMEVAL = 1; then
|
|
REPLACE_GETTIMEOFDAY=1
|
|
fi
|
|
dnl On mingw, the original gettimeofday has only a precision of 15.6
|
|
dnl milliseconds. So override it.
|
|
case "$host_os" in
|
|
mingw*) REPLACE_GETTIMEOFDAY=1 ;;
|
|
esac
|
|
fi
|
|
AC_DEFINE_UNQUOTED([GETTIMEOFDAY_TIMEZONE], [$gl_gettimeofday_timezone],
|
|
[Define this to 'void' or 'struct timezone' to match the system's
|
|
declaration of the second argument to gettimeofday.])
|
|
])
|
|
|
|
# Prerequisites of lib/gettimeofday.c.
|
|
AC_DEFUN([gl_PREREQ_GETTIMEOFDAY], [:])
|