]> git.eshelyaron.com Git - emacs.git/commitdiff
maybe_disable_address_randomization always returns "int argc"
authorSam Steingold <sds@gnu.org>
Mon, 12 Nov 2018 14:10:11 +0000 (09:10 -0500)
committerSam Steingold <sds@gnu.org>
Mon, 12 Nov 2018 14:10:11 +0000 (09:10 -0500)
maybe_disable_address_randomization needs a consistent signature
regardless of HAVE_PERSONALITY_ADDR_NO_RANDOMIZE.

src/lisp.h

index 383d61274c43b223d4554db8e77532a9602677ca..f8ffb33a641de4ec37d4bea1f93abecc3683a3a9 100644 (file)
@@ -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 *);