* libc/include/ctype.h: __CYGWIN32__ -> __CYGWIN__

* libc/include/malloc.h: Ditto.
* libc/include/process.h: Ditto.
* libc/include/stdio.h: Ditto.
* libc/include/stdlib.h: Ditto.
* libc/include/time.h: Ditto.
* libc/include/machine/setjmp.h: Ditto.
* libc/include/sys/errno.h: Ditto.
* libc/include/sys/signal.h: Ditto.
* libc/include/sys/stat.h: Ditto.
* libc/include/sys/time.h: Ditto.
* libc/include/sys/unistd.h: Ditto.
* libc/include/string.h: Ditto.  strsignal should return a const char *.

5 files changed, 9 insertions, 9 deletions

diff --git a/newlib/libc/include/sys/errno.h b/newlib/libc/include/sys/errno.h
index 6d85d49a9..cc791fcb2 100644
--- a/newlib/libc/include/sys/errno.h
+++ b/newlib/libc/include/sys/errno.h
@@ -15,7 +15,7 @@ extern "C" {
 extern int *__errno _PARAMS ((void));
 #endif
 
-#if !defined(__CYGWIN32__) || defined(__INSIDE_CYGWIN__)
+#if !defined(__CYGWIN__) || defined(__INSIDE_CYGWIN__)
 extern _CONST char * _CONST _sys_errlist[];
 extern int _sys_nerr;
 #else
diff --git a/newlib/libc/include/sys/signal.h b/newlib/libc/include/sys/signal.h
index 00d25ead3..4f4119937 100644
--- a/newlib/libc/include/sys/signal.h
+++ b/newlib/libc/include/sys/signal.h
@@ -31,7 +31,7 @@ struct sigaction
 int sigprocmask (int __how, const sigset_t *__a, sigset_t *__b);
 
 /* protos for functions found in winsup sources */
-#if defined(__CYGWIN32__)
+#if defined(__CYGWIN__)
 #undef sigaddset
 #undef sigemptyset
 /* The first argument to kill should be pid_t.  Right now
@@ -86,7 +86,7 @@ int _EXFUN(sigpause, (int));
 #define SIGUSR1	18
 #define SIGUSR2	19
 #define NSIG    20
-#elif defined(__CYGWIN32__)	/* BSD signals symantics */
+#elif defined(__CYGWIN__)	/* BSD signals symantics */
 #define	SIGHUP	1	/* hangup */
 #define	SIGINT	2	/* interrupt */
 #define	SIGQUIT	3	/* quit */
diff --git a/newlib/libc/include/sys/stat.h b/newlib/libc/include/sys/stat.h
index 5c419b713..c5102aaf7 100644
--- a/newlib/libc/include/sys/stat.h
+++ b/newlib/libc/include/sys/stat.h
@@ -134,7 +134,7 @@ int	_EXFUN(lstat,( const char *__path, struct stat *__buf ));
 int	_EXFUN(_fstat,( int __fd, struct stat *__sbuf ));
 int	_EXFUN(_stat,( const char *__path, struct stat *__sbuf ));
 
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 int	_EXFUN(lstat,( const char *__path, struct stat *__buf ));
 #endif
 
diff --git a/newlib/libc/include/sys/time.h b/newlib/libc/include/sys/time.h
index bc08820a5..ff0963676 100644
--- a/newlib/libc/include/sys/time.h
+++ b/newlib/libc/include/sys/time.h
@@ -23,9 +23,9 @@ struct timezone {
   int tz_dsttime;
 };
 
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 #include <sys/select.h>
-#endif /* __CYGWIN32__ */
+#endif /* __CYGWIN__ */
 
 #endif /* _WINSOCK_H */
 
diff --git a/newlib/libc/include/sys/unistd.h b/newlib/libc/include/sys/unistd.h
index 2b8c6a0f0..1986edea6 100644
--- a/newlib/libc/include/sys/unistd.h
+++ b/newlib/libc/include/sys/unistd.h
@@ -83,7 +83,7 @@ void *  _EXFUN(_sbrk,  (size_t __incr));
 int     _EXFUN(_unlink, (const char *__path ));
 int     _EXFUN(_write, (int __fildes, const void *__buf, size_t __nbyte ));
 
-#if defined(__CYGWIN32__) || defined(__rtems__)
+#if defined(__CYGWIN__) || defined(__rtems__)
 unsigned _EXFUN(usleep, (unsigned int __useconds));
 int     _EXFUN(ftruncate, (int __fd, off_t __length));
 int     _EXFUN(truncate, (const char *, off_t __length));
@@ -125,7 +125,7 @@ int     _EXFUN(symlink, (const char *__name1, const char *__name2));
 #endif
 #endif
 
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 # define _POSIX_JOB_CONTROL	1
 # define _POSIX_SAVED_IDS	0
 # define _POSIX_VERSION		199009L
@@ -166,7 +166,7 @@ long _EXFUN(sysconf, (int __name));
 # endif		/* _POSIX_SOURCE */
 
 /* FIXME: This is temporary until winsup gets sorted out.  */
-#ifdef __CYGWIN32__
+#ifdef __CYGWIN__
 #define MAXPATHLEN (260 - 1 /* NUL */)
 #else
 # define	MAXPATHLEN	1024