diff src/sysdep.c @ 231:557eaa0339bf r20-5b14

Import from CVS: tag r20-5b14
author cvs
date Mon, 13 Aug 2007 10:13:48 +0200
parents 12579d965149
children 41f2f0e326e9
line wrap: on
line diff
--- a/src/sysdep.c	Mon Aug 13 10:13:03 2007 +0200
+++ b/src/sysdep.c	Mon Aug 13 10:13:48 2007 +0200
@@ -63,13 +63,14 @@
 #include "syswait.h"
 #include "sysdir.h"
 #include "systime.h"
-#if defined(WINDOWSNT)
+#if defined(WINDOWSNT) || defined(__CYGWIN32__)
 #include "syssignal.h"
-#else
+#endif
+#ifndef WINDOWSNT
 #include <sys/times.h>
 #endif
 
-#ifdef WINDOWSNT
+#if defined(WINDOWSNT)
 #include <direct.h>
 /* In process.h which conflicts with the local copy.  */
 #define _P_WAIT 0
@@ -2195,7 +2196,7 @@
       hostname_size <<= 1;
       hostname = (char *) alloca (hostname_size);
     }
-# ifdef HAVE_SOCKETS
+# if defined( HAVE_SOCKETS) && !defined(__CYGWIN32__)
   /* Turn the hostname into the official, fully-qualified hostname.
      Don't do this if we're going to dump; this can confuse system
      libraries on some machines and make the dumped emacs core dump. */
@@ -3245,8 +3246,8 @@
 
 #if !defined (SYS_SIGLIST_DECLARED) && !defined (HAVE_SYS_SIGLIST)
 
-#ifdef WINDOWSNT
-char *sys_siglist[] =
+#if defined(WINDOWSNT) || defined(__CYGWIN32__)
+CONST char *sys_siglist[] =
   {
     "bum signal!!",
     "hangup",