aboutsummaryrefslogtreecommitdiff
path: root/gdb
diff options
context:
space:
mode:
Diffstat (limited to 'gdb')
-rw-r--r--gdb/ChangeLog9
-rw-r--r--gdb/rdi-share/devsw.c2
-rw-r--r--gdb/rdi-share/host.h10
-rw-r--r--gdb/rdi-share/hostchan.c2
-rw-r--r--gdb/rdi-share/hostchan.h10
-rw-r--r--gdb/rdi-share/serdrv.c2
-rw-r--r--gdb/rdi-share/serpardr.c2
-rw-r--r--gdb/rdi-share/unixcomm.c4
-rw-r--r--gdb/sparcl-tdep.c2
9 files changed, 18 insertions, 25 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index f53f97f..131967f 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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
diff --git a/gdb/rdi-share/devsw.c b/gdb/rdi-share/devsw.c
index 6ad0e4d..214b817 100644
--- a/gdb/rdi-share/devsw.c
+++ b/gdb/rdi-share/devsw.c
@@ -53,7 +53,7 @@ static void openLogFile ()
/* 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
}
diff --git a/gdb/rdi-share/host.h b/gdb/rdi-share/host.h
index 2fdbf5f..9944c15 100644
--- a/gdb/rdi-share/host.h
+++ b/gdb/rdi-share/host.h
@@ -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
diff --git a/gdb/rdi-share/hostchan.c b/gdb/rdi-share/hostchan.c
index 3114c52..483bc5b 100644
--- a/gdb/rdi-share/hostchan.c
+++ b/gdb/rdi-share/hostchan.c
@@ -556,7 +556,7 @@ static unsigned long tv_diff(const struct timeval *time_now,
- ((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();
diff --git a/gdb/rdi-share/hostchan.h b/gdb/rdi-share/hostchan.h
index 3e6d26f..b60804d 100644
--- a/gdb/rdi-share/hostchan.h
+++ b/gdb/rdi-share/hostchan.h
@@ -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"
diff --git a/gdb/rdi-share/serdrv.c b/gdb/rdi-share/serdrv.c
index 91f8f19..bff6a18 100644
--- a/gdb/rdi-share/serdrv.c
+++ b/gdb/rdi-share/serdrv.c
@@ -254,7 +254,7 @@ static int SerialOpen(const char *name, const char *arg)
serial_reset();
-#if defined(__unix) || defined(__CYGWIN32__)
+#if defined(__unix) || defined(__CYGWIN__)
Unix_ioctlNonBlocking();
#endif
diff --git a/gdb/rdi-share/serpardr.c b/gdb/rdi-share/serpardr.c
index 604d048..fad0548 100644
--- a/gdb/rdi-share/serpardr.c
+++ b/gdb/rdi-share/serpardr.c
@@ -278,7 +278,7 @@ static int SerparOpen(const char *name, const char *arg)
serpar_reset();
-#if defined(__unix) || defined(__CYGWIN32__)
+#if defined(__unix) || defined(__CYGWIN__)
Unix_ioctlNonBlocking();
#endif
diff --git a/gdb/rdi-share/unixcomm.c b/gdb/rdi-share/unixcomm.c
index 0abd411..2204d6d 100644
--- a/gdb/rdi-share/unixcomm.c
+++ b/gdb/rdi-share/unixcomm.c
@@ -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_IsSerialInUse(void)
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);
diff --git a/gdb/sparcl-tdep.c b/gdb/sparcl-tdep.c
index 87351f1..aa06747 100644
--- a/gdb/sparcl-tdep.c
+++ b/gdb/sparcl-tdep.c
@@ -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>