This is the mail archive of the
gdb-patches@sources.redhat.com
mailing list for the GDB project.
[patch] Use __CYGWIN__ instead of __CYGWIN32__
- From: Andrew Cagney <ac131313 at cygnus dot com>
- To: gdb-patches at sources dot redhat dot com
- Date: Sat, 08 Jun 2002 16:35:59 -0400
- Subject: [patch] Use __CYGWIN__ instead of __CYGWIN32__
FYI,
This zaps a few remaining cases where the old __CYGWIN32__ was used.
committed,
Andrew
? diffs
? head
? new-gdbarch.log
? new-gdbarch.h
? new-gdbarch.c
? gdbarch.log
Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/gdb/ChangeLog,v
retrieving revision 1.2737
diff -u -r1.2737 ChangeLog
--- ChangeLog 8 Jun 2002 20:02:48 -0000 1.2737
+++ ChangeLog 8 Jun 2002 20:23:01 -0000
@@ -1,5 +1,14 @@
2002-06-08 Andrew Cagney <ac131313@redhat.com>
+ * sparcl-tdep.c: Use __CYGWIN__ instead of __CYGWIN32__.
+ * rdi-share/serpardr.c: Ditto.
+ * rdi-share/unixcomm.c: Ditto.
+ * rdi-share/serdrv.c: Ditto.
+ * rdi-share/hostchan.h: Ditto.
+ * rdi-share/hostchan.c: Ditto.
+ * rdi-share/host.h: Ditto.
+ * rdi-share/devsw.c: Ditto.
+
* objfiles.h: Change type of obj_private to void pointer.
* pa64solib.c: Update copyright. Don't include "assert.h", use
strcmp instead of STREQ, use LONGEST, do not use PTR
Index: sparcl-tdep.c
===================================================================
RCS file: /cvs/src/src/gdb/sparcl-tdep.c,v
retrieving revision 1.15
diff -u -r1.15 sparcl-tdep.c
--- sparcl-tdep.c 5 Jan 2002 04:30:19 -0000 1.15
+++ sparcl-tdep.c 8 Jun 2002 20:23:05 -0000
@@ -27,7 +27,7 @@
#include "regcache.h"
#include <sys/types.h>
-#if (!defined(__GO32__) && !defined(_WIN32)) || defined(__CYGWIN32__)
+#if (!defined(__GO32__) && !defined(_WIN32)) || defined(__CYGWIN__)
#define HAVE_SOCKETS
#include <sys/time.h>
#include <sys/socket.h>
Index: rdi-share/devsw.c
===================================================================
RCS file: /cvs/src/src/gdb/rdi-share/devsw.c,v
retrieving revision 1.3
diff -u -r1.3 devsw.c
--- rdi-share/devsw.c 20 Jan 2002 22:44:44 -0000 1.3
+++ rdi-share/devsw.c 8 Jun 2002 20:24:24 -0000
@@ -53,7 +53,7 @@
/* The following line is equivalent to: */
/* setlinebuf (angelDebugLogFile); */
setvbuf(angelDebugLogFile, (char *)NULL, _IOLBF, 0);
-#if defined(__CYGWIN32__) || defined(__CYGWIN__)
+#if defined(__CYGWIN__)
setmode(fileno(angelDebugLogFile), O_TEXT);
#endif
}
Index: rdi-share/host.h
===================================================================
RCS file: /cvs/src/src/gdb/rdi-share/host.h,v
retrieving revision 1.5
diff -u -r1.5 host.h
--- rdi-share/host.h 6 Feb 2002 20:09:18 -0000 1.5
+++ rdi-share/host.h 8 Jun 2002 20:24:24 -0000
@@ -29,14 +29,6 @@
# define offsetof(T, member) ((char *)&(((T *)0)->member) - (char *)0)
#endif
-/* If under Cygwin, provide backwards compatibility with older
- Cygwin compilers that don't define the current cpp define. */
-#ifdef __CYGWIN32__
-#ifndef __CYGWIN__
-#define __CYGWIN__
-#endif
-#endif
-
/* A temporary sop to older compilers */
#if defined (__NetBSD__) || defined (unix)
# ifndef __unix /* (good for long-term portability?) */
@@ -52,7 +44,7 @@
#endif
#if defined(_WIN32)
# define COMPILING_ON_WIN32 1
-# if !defined(__CYGWIN32__)
+# if !defined(__CYGWIN__)
# define COMPILING_ON_WINDOWS 1
# endif
#endif
Index: rdi-share/hostchan.c
===================================================================
RCS file: /cvs/src/src/gdb/rdi-share/hostchan.c,v
retrieving revision 1.1.1.2
diff -u -r1.1.1.2 hostchan.c
--- rdi-share/hostchan.c 2 Nov 1999 04:44:26 -0000 1.1.1.2
+++ rdi-share/hostchan.c 8 Jun 2002 20:27:46 -0000
@@ -556,7 +556,7 @@
- ((time_was->tv_sec * 1000000) + time_was->tv_usec) );
}
-#if !defined(__unix) && !defined(__CYGWIN32__)
+#if !defined(__unix) && !defined(__CYGWIN__)
static void gettimeofday( struct timeval *time_now, void *dummy )
{
time_t t = clock();
Index: rdi-share/hostchan.h
===================================================================
RCS file: /cvs/src/src/gdb/rdi-share/hostchan.h,v
retrieving revision 1.2
diff -u -r1.2 hostchan.h
--- rdi-share/hostchan.h 29 Jun 2001 01:19:23 -0000 1.2
+++ rdi-share/hostchan.h 8 Jun 2002 20:27:46 -0000
@@ -15,14 +15,6 @@
#ifndef angsd_hostchan_h
#define angsd_hostchan_h
-/* If under Cygwin, provide backwards compatibility with older
- Cygwin compilers that don't define the current cpp define. */
-#ifdef __CYGWIN32__
-#ifndef __CYGWIN__
-#define __CYGWIN__
-#endif
-#endif
-
/* A temporary sop to older compilers */
#if defined (__NetBSD__) || defined (unix)
# ifndef __unix /* (good for long-term portability?) */
@@ -31,7 +23,7 @@
#endif
/* struct timeval */
-#if defined(__unix) || defined(__CYGWIN32__)
+#if defined(__unix) || defined(__CYGWIN__)
# include <sys/time.h>
#else
# include "winsock.h"
Index: rdi-share/serdrv.c
===================================================================
RCS file: /cvs/src/src/gdb/rdi-share/serdrv.c,v
retrieving revision 1.1.1.3
diff -u -r1.1.1.3 serdrv.c
--- rdi-share/serdrv.c 18 Jan 2000 00:54:36 -0000 1.1.1.3
+++ rdi-share/serdrv.c 8 Jun 2002 20:28:51 -0000
@@ -254,7 +254,7 @@
serial_reset();
-#if defined(__unix) || defined(__CYGWIN32__)
+#if defined(__unix) || defined(__CYGWIN__)
Unix_ioctlNonBlocking();
#endif
Index: rdi-share/serpardr.c
===================================================================
RCS file: /cvs/src/src/gdb/rdi-share/serpardr.c,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 serpardr.c
--- rdi-share/serpardr.c 16 Apr 1999 01:34:28 -0000 1.1.1.1
+++ rdi-share/serpardr.c 8 Jun 2002 20:29:56 -0000
@@ -278,7 +278,7 @@
serpar_reset();
-#if defined(__unix) || defined(__CYGWIN32__)
+#if defined(__unix) || defined(__CYGWIN__)
Unix_ioctlNonBlocking();
#endif
Index: rdi-share/unixcomm.c
===================================================================
RCS file: /cvs/src/src/gdb/rdi-share/unixcomm.c,v
retrieving revision 1.3
diff -u -r1.3 unixcomm.c
--- rdi-share/unixcomm.c 29 Jun 2001 01:19:23 -0000 1.3
+++ rdi-share/unixcomm.c 8 Jun 2002 20:29:57 -0000
@@ -96,7 +96,7 @@
#define PARPORT2 "/dev/par1"
#endif
-#if defined(_WIN32) || defined (__CYGWIN32__)
+#if defined(_WIN32) || defined (__CYGWIN__)
#define SERIAL_PREFIX "com"
#define SERPORT1 "com1"
#define SERPORT2 "com2"
@@ -248,7 +248,7 @@
extern int Unix_OpenSerial(const char *name)
{
-#if defined(BSD) || defined(__CYGWIN32__)
+#if defined(BSD) || defined(__CYGWIN__)
serpfd = open(name, O_RDWR);
#else
serpfd = open(name, O_RDWR | O_NONBLOCK);