mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2024-11-22 07:09:54 +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.
121 lines
4.3 KiB
Plaintext
121 lines
4.3 KiB
Plaintext
# Configure a replacement for <sys/time.h>.
|
|
# serial 12
|
|
|
|
# Copyright (C) 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.
|
|
|
|
# Written by Paul Eggert and Martin Lambers.
|
|
|
|
AC_DEFUN_ONCE([gl_SYS_TIME_H],
|
|
[
|
|
dnl Use AC_REQUIRE here, so that the REPLACE_GETTIMEOFDAY=0 statement
|
|
dnl below is expanded once only, before all REPLACE_GETTIMEOFDAY=1
|
|
dnl statements that occur in other macros.
|
|
AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS])
|
|
AC_REQUIRE([AC_C_RESTRICT])
|
|
AC_CHECK_HEADERS_ONCE([sys/time.h])
|
|
gl_CHECK_NEXT_HEADERS([sys/time.h])
|
|
|
|
if test $ac_cv_header_sys_time_h != yes; then
|
|
HAVE_SYS_TIME_H=0
|
|
fi
|
|
|
|
dnl On native Windows with MSVC, 'struct timeval' is defined in <winsock2.h>
|
|
dnl only. So include that header in the list.
|
|
gl_PREREQ_SYS_H_WINSOCK2
|
|
AC_CACHE_CHECK([for struct timeval], [gl_cv_sys_struct_timeval],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#if HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#endif
|
|
#include <time.h>
|
|
#if HAVE_WINSOCK2_H
|
|
# include <winsock2.h>
|
|
#endif
|
|
]],
|
|
[[static struct timeval x; x.tv_sec = x.tv_usec;]])],
|
|
[gl_cv_sys_struct_timeval=yes],
|
|
[gl_cv_sys_struct_timeval=no])
|
|
])
|
|
if test $gl_cv_sys_struct_timeval != yes; then
|
|
HAVE_STRUCT_TIMEVAL=0
|
|
else
|
|
dnl On native Windows with a 64-bit 'time_t', 'struct timeval' is defined
|
|
dnl (in <sys/time.h> and <winsock2.h> for mingw64, in <winsock2.h> only
|
|
dnl for MSVC) with a tv_sec field of type 'long' (32-bit!), which is
|
|
dnl smaller than the 'time_t' type mandated by POSIX.
|
|
dnl On OpenBSD 5.1 amd64, tv_sec is 64 bits and time_t 32 bits, but
|
|
dnl that is good enough.
|
|
AC_CACHE_CHECK([for wide-enough struct timeval.tv_sec member],
|
|
[gl_cv_sys_struct_timeval_tv_sec],
|
|
[AC_COMPILE_IFELSE(
|
|
[AC_LANG_PROGRAM(
|
|
[[#if HAVE_SYS_TIME_H
|
|
#include <sys/time.h>
|
|
#endif
|
|
#include <time.h>
|
|
#if HAVE_WINSOCK2_H
|
|
# include <winsock2.h>
|
|
#endif
|
|
]],
|
|
[[static struct timeval x;
|
|
typedef int verify_tv_sec_type[
|
|
sizeof (time_t) <= sizeof x.tv_sec ? 1 : -1
|
|
];
|
|
]])],
|
|
[gl_cv_sys_struct_timeval_tv_sec=yes],
|
|
[gl_cv_sys_struct_timeval_tv_sec=no])
|
|
])
|
|
if test $gl_cv_sys_struct_timeval_tv_sec != yes; then
|
|
REPLACE_STRUCT_TIMEVAL=1
|
|
fi
|
|
fi
|
|
|
|
dnl Check for declarations of anything we want to poison if the
|
|
dnl corresponding gnulib module is not in use.
|
|
gl_WARN_ON_USE_PREPARE([[
|
|
#if HAVE_SYS_TIME_H
|
|
# include <sys/time.h>
|
|
#endif
|
|
#include <time.h>
|
|
]], [gettimeofday])
|
|
])
|
|
|
|
# gl_SYS_TIME_MODULE_INDICATOR([modulename])
|
|
# sets the shell variable that indicates the presence of the given module
|
|
# to a C preprocessor expression that will evaluate to 1.
|
|
# This macro invocation must not occur in macros that are AC_REQUIREd.
|
|
AC_DEFUN([gl_SYS_TIME_MODULE_INDICATOR],
|
|
[
|
|
dnl Ensure to expand the default settings once only.
|
|
gl_SYS_TIME_H_REQUIRE_DEFAULTS
|
|
gl_MODULE_INDICATOR_SET_VARIABLE([$1])
|
|
dnl Define it also as a C macro, for the benefit of the unit tests.
|
|
gl_MODULE_INDICATOR_FOR_TESTS([$1])
|
|
])
|
|
|
|
# Initializes the default values for AC_SUBSTed shell variables.
|
|
# This macro must not be AC_REQUIREd. It must only be invoked, and only
|
|
# outside of macros or in macros that are not AC_REQUIREd.
|
|
AC_DEFUN([gl_SYS_TIME_H_REQUIRE_DEFAULTS],
|
|
[
|
|
m4_defun(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS], [
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_GETTIMEOFDAY])
|
|
])
|
|
m4_require(GL_MODULE_INDICATOR_PREFIX[_SYS_TIME_H_MODULE_INDICATOR_DEFAULTS])
|
|
AC_REQUIRE([gl_SYS_TIME_H_DEFAULTS])
|
|
])
|
|
|
|
AC_DEFUN([gl_SYS_TIME_H_DEFAULTS],
|
|
[
|
|
dnl Assume POSIX behavior unless another module says otherwise.
|
|
HAVE_GETTIMEOFDAY=1; AC_SUBST([HAVE_GETTIMEOFDAY])
|
|
HAVE_STRUCT_TIMEVAL=1; AC_SUBST([HAVE_STRUCT_TIMEVAL])
|
|
HAVE_SYS_TIME_H=1; AC_SUBST([HAVE_SYS_TIME_H])
|
|
REPLACE_GETTIMEOFDAY=0; AC_SUBST([REPLACE_GETTIMEOFDAY])
|
|
REPLACE_STRUCT_TIMEVAL=0; AC_SUBST([REPLACE_STRUCT_TIMEVAL])
|
|
])
|