Github/emacs
2
0
Fork 1
mirror of git://git.sv.gnu.org/emacs.git synced 2026-06-14 12:31:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix the Android port

Browse source 
* configure.ac (gl_cv_onwards_func_tzalloc): Don't disable on
Android SDK 35.

* src/conf_post.h (tzalloc): Don't override Gnulib-selected
identifier on Android SDK 35.
This commit is contained in:
Po Lu 2025-11-05 10:32:52 +08:00
parent abcc099c73
commit 240355949e
2 changed files with 0 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configure.ac
View file

@ -49,11 +49,6 @@ if test "$XCONFIGURE" = "android"; then
CFLAGS="$CFLAGS -D_FILE_OFFSET_BITS=32"
enable_largefile=no
enable_year2038=no])
# Gnulib should not attempt not to reimplement tzalloc, as strftime
# attempts to link with symbols that are only present in the Gnulib
# replacement.
AS_IF([test "$ANDROID_SDK" -ge "35"],
[gl_cv_onwards_func_tzalloc="future OS version"])
fi
dnl Set emacs_config_options to the options of 'configure', quoted for the shell,

11
src/conf_post.h
View file

@ -396,14 +396,3 @@ extern int emacs_setenv_TZ (char const *);
: S_ISCHR (mode) ? DT_CHR : S_ISFIFO (mode) ? DT_FIFO \
: S_ISSOCK (mode) ? DT_SOCK : DT_UNKNOWN)
#endif /* MSDOS */
#if defined __ANDROID__ && __ANDROID_API__ >= 35
#define _GL_TIME_H
#include <time.h>
#undef _GL_TIME_H
/* Redefine tzalloc so as not to conflict with its
system-provided version, which is incompatible.
Do not redefine tzfree, as Gnulib does that. */
#define tzalloc rpl_tzalloc
#endif /* defined __ANDROID__ && __ANDROID_API__ >= 35 */