From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 14 Apr 2011 06:26:22 +0000 (-0700)
Subject: * sysdep.c (croak): Now static, if
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~295
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5d4cb038a45cc94f9a132cf44a787b73e1e3055c;p=emacs.git

* sysdep.c (croak): Now static, if

defined TIOCNOTTY || defined USG5 || defined CYGWIN.
* syssignal.h (croak): Declare only if not static.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index fb97a49e5b5..70b976e2558 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,8 @@
- 2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+2011-04-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* sysdep.c (croak): Now static, if
+	defined TIOCNOTTY || defined USG5 || defined CYGWIN.
+	* syssignal.h (croak): Declare only if not static.
 
 	* alloc.c (refill_memory_reserve): Now static if
 	!defined REL_ALLOC || defined SYSTEM_MALLOC.
diff --git a/src/sysdep.c b/src/sysdep.c
index a9ad4b4dea3..3dc255933ee 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -120,6 +120,9 @@ struct utimbuf {
 
 static int emacs_get_tty (int, struct emacs_tty *);
 static int emacs_set_tty (int, struct emacs_tty *, int);
+#if defined TIOCNOTTY || defined USG5 || defined CYGWIN
+static void croak (char *) NO_RETURN;
+#endif
 
 /* Declare here, including term.h is problematic on some systems.  */
 extern void tputs (const char *, int, int (*)(int));
diff --git a/src/syssignal.h b/src/syssignal.h
index a2329fd0fdb..c5c749407cc 100644
--- a/src/syssignal.h
+++ b/src/syssignal.h
@@ -74,7 +74,9 @@ signal_handler_t sys_signal (int signal_number, signal_handler_t action);
 sigset_t sys_sigblock   (sigset_t new_mask);
 sigset_t sys_sigunblock (sigset_t new_mask);
 sigset_t sys_sigsetmask (sigset_t new_mask);
+#if ! (defined TIOCNOTTY || defined USG5 || defined CYGWIN)
 void croak (char *) NO_RETURN;
+#endif
 
 #define sys_sigdel(MASK,SIG) sigdelset (&MASK,SIG)