* 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.
This commit is contained in:
Andrew Cagney 2002-06-08 20:34:41 +00:00
parent c5f1036687
commit a3efda28be
9 changed files with 18 additions and 25 deletions

View file

@ -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

View file

@ -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
}

View file

@ -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

View file

@ -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();

View file

@ -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"

View file

@ -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

View file

@ -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

View file

@ -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);

View file

@ -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>