mirror of
https://git.savannah.gnu.org/git/emacs.git
synced 2025-01-26 19:18:50 +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.
71 lines
2.6 KiB
Plaintext
71 lines
2.6 KiB
Plaintext
# serial 20
|
|
# Configure fcntl.h.
|
|
dnl Copyright (C) 2006-2007, 2009-2021 Free Software Foundation, Inc.
|
|
dnl This file is free software; the Free Software Foundation
|
|
dnl gives unlimited permission to copy and/or distribute it,
|
|
dnl with or without modifications, as long as this notice is preserved.
|
|
|
|
dnl Written by Paul Eggert.
|
|
|
|
AC_DEFUN_ONCE([gl_FCNTL_H],
|
|
[
|
|
AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
|
|
AC_REQUIRE([gl_FCNTL_O_FLAGS])
|
|
gl_NEXT_HEADERS([fcntl.h])
|
|
|
|
dnl Ensure the type pid_t gets defined.
|
|
AC_REQUIRE([AC_TYPE_PID_T])
|
|
|
|
dnl Ensure the type mode_t gets defined.
|
|
AC_REQUIRE([AC_TYPE_MODE_T])
|
|
|
|
dnl Check for declarations of anything we want to poison if the
|
|
dnl corresponding gnulib module is not in use, if it is not common
|
|
dnl enough to be declared everywhere.
|
|
gl_WARN_ON_USE_PREPARE([[#include <fcntl.h>
|
|
]], [fcntl openat])
|
|
])
|
|
|
|
# gl_FCNTL_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_FCNTL_MODULE_INDICATOR],
|
|
[
|
|
dnl Ensure to expand the default settings once only.
|
|
gl_FCNTL_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_FCNTL_H_REQUIRE_DEFAULTS],
|
|
[
|
|
m4_defun(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS], [
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_CREAT])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_FCNTL])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_NONBLOCKING])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPEN])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_OPENAT])
|
|
dnl Support Microsoft deprecated alias function names by default.
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_CREAT], [1])
|
|
gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_MDA_OPEN], [1])
|
|
])
|
|
m4_require(GL_MODULE_INDICATOR_PREFIX[_FCNTL_H_MODULE_INDICATOR_DEFAULTS])
|
|
AC_REQUIRE([gl_FCNTL_H_DEFAULTS])
|
|
])
|
|
|
|
AC_DEFUN([gl_FCNTL_H_DEFAULTS],
|
|
[
|
|
dnl Assume proper GNU behavior unless another module says otherwise.
|
|
HAVE_FCNTL=1; AC_SUBST([HAVE_FCNTL])
|
|
HAVE_OPENAT=1; AC_SUBST([HAVE_OPENAT])
|
|
REPLACE_CREAT=0; AC_SUBST([REPLACE_CREAT])
|
|
REPLACE_FCNTL=0; AC_SUBST([REPLACE_FCNTL])
|
|
REPLACE_OPEN=0; AC_SUBST([REPLACE_OPEN])
|
|
REPLACE_OPENAT=0; AC_SUBST([REPLACE_OPENAT])
|
|
])
|