summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-07-10 23:05:57 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-07-10 23:05:57 -0700
commitda85a02af7585384008d3ebec836a7b8571f175d (patch)
treee6d4f34119ea1c45985eaed207ef6b47f650ea93 /src/emacs.c
parent7f5515125fbc9b46454e1f84b7e3052a0a5326f0 (diff)
parent4d45a8b7a237e1d33d0ae71d95a0ed7165ea6cda (diff)
downloademacs-da85a02af7585384008d3ebec836a7b8571f175d.tar.gz
Merge from trunk.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/emacs.c b/src/emacs.c
index a055d89d35f..39870ec0079 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -356,8 +356,7 @@ fatal_error_signal (int sig)
/* Handler for SIGDANGER. */
void
-memory_warning_signal (sig)
- int sig;
+memory_warning_signal (int sig)
{
signal (sig, memory_warning_signal);
SIGNAL_THREAD_CHECK (sig);