From: Sam Steingold <sds@gnu.org>
Date: Mon, 12 Nov 2018 14:10:11 +0000 (-0500)
Subject: maybe_disable_address_randomization always returns "int argc"
X-Git-Tag: emacs-27.0.90~4180
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=db711687c3983eda60275dadcc4dc75119e6c0ae;p=emacs.git

maybe_disable_address_randomization always returns "int argc"

maybe_disable_address_randomization needs a consistent signature
regardless of HAVE_PERSONALITY_ADDR_NO_RANDOMIZE.
---

diff --git a/src/lisp.h b/src/lisp.h
index 383d61274c4..f8ffb33a641 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -4327,9 +4327,10 @@ struct tty_display_info;
 #ifdef HAVE_PERSONALITY_ADDR_NO_RANDOMIZE
 extern int maybe_disable_address_randomization (bool, int, char **);
 #else
-INLINE void
+INLINE int
 maybe_disable_address_randomization (bool dumping, int argc, char **argv)
 {
+  return argc;
 }
 #endif
 extern int emacs_exec_file (char const *, char *const *, char *const *);