* 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 fb97a49e5b50817a5ee9a4ae1b0992c5ed3b581e..70b976e2558d92d9fa01c419eae7763fdea35446 100644 (file)
--- 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 a9ad4b4dea38f47f238ca7f0298b594698ef92b8..3dc255933eeb21a4b6c66e42cedcff5372ed99b2 100644 (file)
--- 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 a2329fd0fdb686fd075f3a02e5a339184666097d..c5c749407cc833204341251627eab3362d4d384b 100644 (file)
--- 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)