procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove workarounds for lib/boot-time.o failures

Browse source 
* configure.ac (UTMP_H_DEFINES_BOOT_TIME):
* src/conf_post.h [__ANDROID__]: Delete workarounds, now that
Gnulib has been corrected.
This commit is contained in:
Po Lu 2023-08-14 09:16:24 +08:00
parent 0e390f54fa
commit 3895f88233
2 changed files with 1 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
configure.ac
View file

@ -2710,27 +2710,8 @@ for Android, but all API calls need to be stubbed out])
# Check for some functions not always present in the NDK.
AC_CHECK_DECLS([android_get_device_api_level])
AC_CHECK_DECLS([endutent, sysinfo], [], [],
[[
#include <sys/sysinfo.h>
#include <utmp.h>
]])
# Establish if BOOT_TIME is defined in utmp.h.
AC_CACHE_CHECK([if utmp.h defines BOOT_TIME],
[emacs_cv_utmp_h_defines_boot_time],
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#include <utmp.h>
#ifndef BOOT_TIME
BOOT_TIME not defined
#endif /* BOOT_TIME */
]], [[]])], [emacs_cv_utmp_h_defines_boot_time=yes],
[emacs_cv_utmp_h_defines_boot_time=no])])
AS_IF([test x"$emacs_cv_utmp_h_defines_boot_time" = xyes],
[AC_DEFINE([UTMP_H_DEFINES_BOOT_TIME], [1],
[Define to 1 if building for Android and utmp.h declares BOOT_TIME])])
# Say this build is really for Android.
# Mention this build is really for Android.
REALLY_ANDROID=yes])])
AC_SUBST([ANDROID])

34
src/conf_post.h
View file

@ -471,37 +471,3 @@ extern int emacs_setenv_TZ (char const *);
#undef MB_CUR_MAX
#define MB_CUR_MAX REPLACEMENT_MB_CUR_MAX
#endif /* REPLACEMENT_MB_CUR_MAX */
#ifdef __ANDROID__
/* The Android NDK r10b omits the function `endutent' that is actually
defined in the C library and used by Gnulib. Define a prototype
for it here. */
#if !HAVE_DECL_ENDUTENT
extern void endutent (void);
#endif /* !HAVE_DECL_ENDUTENT */
/* Now define substitutes for BOOT_TIME if necessary. */
#ifndef UTMP_H_DEFINES_BOOT_TIME
#include <utmp.h>
#define BOOT_TIME 2
#endif /* !UTMP_H_DEFINES_BOOT_TIME */
/* sysinfo is also absent from some versions of the NDK, yet is
present on API level 9 and above. */
#if !HAVE_DECL_SYSINFO
#include <sys/sysinfo.h>
#if __ANDROID_API__ >= 9
extern int sysinfo (struct sysinfo *info);
#else /* __ANDROID_API__ < 8 */
/* Gnulib uses this function unconditionally. */
#define sysinfo(ignored) ((void) ignored, (errno = ENOSYS), -1)
#endif /* __ANDROID_API >= 9 */
#endif /* !HAVE_DECL_SYSINFO */
#endif /* __ANDROID__ */