From 7361028434ec3dd5ceb6f2f407b28a6b6566ee3e Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Mon, 16 Dec 2024 03:26:48 +0100 Subject: [PATCH] Invert preprocessor condition to fix 'C-x 4 a' Typing 'C-x 4 a' in the main function now correctly adds 'main' to the generated ChangeLog, whereas before it added 'andreid_emacs_init'. Inverting the preprocessor condition seems like an easier fix than changing the add-change-log-entry-other-window heuristic. * src/emacs.c (main): Invert preprocessor condition to appease the 'add-change-log-entry-other-window' heuristic. (cherry picked from commit eaf5bf736e1dd5eb977a16a3f1b3dfd3da3c4612) --- src/emacs.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/emacs.c b/src/emacs.c index bdd9eee10c4..25b014bf83c 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -1263,12 +1263,12 @@ maybe_load_seccomp (int argc, char **argv) #endif /* SECCOMP_USABLE */ -#if defined HAVE_ANDROID && !defined ANDROID_STUBIFY +#if !defined HAVE_ANDROID || defined ANDROID_STUBIFY int -android_emacs_init (int argc, char **argv, char *dump_file) +main (int argc, char **argv) #else int -main (int argc, char **argv) +android_emacs_init (int argc, char **argv, char *dump_file) #endif { /* Variable near the bottom of the stack, and aligned appropriately -- 2.39.5