aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Steingold2018-11-12 09:10:11 -0500
committerSam Steingold2018-11-12 09:10:11 -0500
commitdb711687c3983eda60275dadcc4dc75119e6c0ae (patch)
treed9fd94d2446e861f2d0856031e22bd6d244672f7 /src
parentc14eab222c5208ec0650292c3771a3ee632fdb0d (diff)
downloademacs-db711687c3983eda60275dadcc4dc75119e6c0ae.tar.gz
emacs-db711687c3983eda60275dadcc4dc75119e6c0ae.zip
maybe_disable_address_randomization always returns "int argc"
maybe_disable_address_randomization needs a consistent signature regardless of HAVE_PERSONALITY_ADDR_NO_RANDOMIZE.
Diffstat (limited to 'src')
-rw-r--r--src/lisp.h3
1 files changed, 2 insertions, 1 deletions
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;
4327#ifdef HAVE_PERSONALITY_ADDR_NO_RANDOMIZE 4327#ifdef HAVE_PERSONALITY_ADDR_NO_RANDOMIZE
4328extern int maybe_disable_address_randomization (bool, int, char **); 4328extern int maybe_disable_address_randomization (bool, int, char **);
4329#else 4329#else
4330INLINE void 4330INLINE int
4331maybe_disable_address_randomization (bool dumping, int argc, char **argv) 4331maybe_disable_address_randomization (bool dumping, int argc, char **argv)
4332{ 4332{
4333 return argc;
4333} 4334}
4334#endif 4335#endif
4335extern int emacs_exec_file (char const *, char *const *, char *const *); 4336extern int emacs_exec_file (char const *, char *const *, char *const *);