diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-10 23:05:57 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-10 23:05:57 -0700 |
| commit | a9df536e890f2f96ceae5bd66033e068c0b81758 (patch) | |
| tree | a88a49c017bca48aa7a49913b761fccc1216beb4 /src/emacs.c | |
| parent | 2bec399e7d4ad048f62f4acd5eef9e86a3c0645e (diff) | |
| parent | b8aff49f994759bded9c8f832658eb80dea85c5f (diff) | |
| download | emacs-a9df536e890f2f96ceae5bd66033e068c0b81758.tar.gz | |
Merge from trunk.
Diffstat (limited to 'src/emacs.c')
| -rw-r--r-- | src/emacs.c | 3 |
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); |