[PATCH] Remove deprecated checks for __CYGWIN32__

[Corinna Vinschen]

Hi,

I've just applied the following patch.  It's sort of obvious since
__CYGWIN32__ has been superceeded by __CYGWIN__ already a long time
ago (back in 1998, AFAIR).

Corinna

2003-05-13  Corinna Vinschen  <corinna@vinschen.de>

        * libc/ctype/ctype_.c: Remove checks for deprecated __CYGWIN32__.
        * libc/include/stdio.h: Ditto.
        * libc/include/sys/config.h: Ditto.
        * libc/stdio/mktemp.c: Ditto.

Index: libc/ctype/ctype_.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/ctype/ctype_.c,v
retrieving revision 1.2
diff -p -u -r1.2 ctype_.c
--- libc/ctype/ctype_.c	11 Jun 2001 19:25:59 -0000	1.2
+++ libc/ctype/ctype_.c	13 May 2003 09:43:55 -0000
@@ -84,7 +84,7 @@ static _CONST char _ctype_b[128 + 256] =
 	_CTYPE_DATA_128_256
 };
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(__CYGWIN__)
 extern _CONST char __declspec(dllexport) _ctype_[1 + 256] __attribute__ ((alias ("_ctype_b+127")));
 _CONST char __declspec(dllexport) *__ctype_ptr = _ctype_b + 128;
 #else
@@ -94,7 +94,7 @@ _CONST char *__ctype_ptr = _ctype_b + 12
 
 #else	/* !defined(ALLOW_NEGATIVE_CTYPE_INDEX) */
 
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(__CYGWIN__)
 _CONST char __declspec(dllexport) _ctype_[1 + 256] = {
 #else
 _CONST char _ctype_[1 + 256] = {
Index: libc/include/stdio.h
===================================================================
RCS file: /cvs/src/src/newlib/libc/include/stdio.h,v
retrieving revision 1.22
diff -p -u -r1.22 stdio.h
--- libc/include/stdio.h	12 May 2003 11:26:11 -0000	1.22
+++ libc/include/stdio.h	13 May 2003 09:43:56 -0000
@@ -79,7 +79,7 @@ typedef _fpos64_t fpos64_t;
 #define	__SNPT	0x0800		/* do not do fseek() optimisation */
 #define	__SOFF	0x1000		/* set iff _offset is in fact correct */
 #define	__SMOD	0x2000		/* true => fgetline modified _p text */
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#if defined(__CYGWIN__)
 #  define __SCLE  0x4000        /* convert line endings CR/LF <-> NL */
 #endif
 #define	__SL64	0x8000		/* is 64-bit offset large file */
Index: libc/include/sys/config.h
===================================================================
RCS file: /cvs/src/src/newlib/libc/include/sys/config.h,v
retrieving revision 1.38
diff -p -u -r1.38 config.h
--- libc/include/sys/config.h	9 May 2003 21:38:31 -0000	1.38
+++ libc/include/sys/config.h	13 May 2003 09:43:56 -0000
@@ -147,7 +147,7 @@
 #define __RAND_MAX 0x7fffffff
 #endif
 
-#if defined(__CYGWIN32__) || defined(__CYGWIN__)
+#if defined(__CYGWIN__)
 #include <cygwin/config.h>
 #endif
 
Index: libc/stdio/mktemp.c
===================================================================
RCS file: /cvs/src/src/newlib/libc/stdio/mktemp.c,v
retrieving revision 1.6
diff -p -u -r1.6 mktemp.c
--- libc/stdio/mktemp.c	13 May 2003 09:19:15 -0000	1.6
+++ libc/stdio/mktemp.c	13 May 2003 09:43:56 -0000
@@ -155,7 +155,7 @@ _DEFUN (_gettemp, (ptr, path, doopen),
 	  if ((*doopen = _open_r (ptr, path, O_CREAT | O_EXCL | O_RDWR, 0600))
 	      >= 0)
 	    return 1;
-#if defined(__CYGWIN32__) || defined(__CYGWIN__)
+#if defined(__CYGWIN__)
 	  if (ptr->_errno != EEXIST && ptr->_errno != EACCES)
 #else
 	  if (ptr->_errno != EEXIST)

-- 
Corinna Vinschen
Cygwin Developer
Red Hat, Inc.
mailto:vinschen@redhat.com