From 51a46b54ba2d7ea5272cf56a4934d3ce5e766b38 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 10 Feb 2003 22:13:35 +0000 Subject: [PATCH] * libc/include/sys/types.h: Don't define __MS_types__ for Cygwin. Don't define some types under cygwin. --- newlib/ChangeLog | 5 +++++ newlib/libc/include/sys/types.h | 9 ++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/newlib/ChangeLog b/newlib/ChangeLog index 90b2deff7..0a6191f2a 100644 --- a/newlib/ChangeLog +++ b/newlib/ChangeLog @@ -1,3 +1,8 @@ +2003-02-10 Christopher Faylor + + * libc/include/sys/types.h: Don't define __MS_types__ for Cygwin. + Don't define some types under cygwin. + 2003-02-07 Jeff Johnston * acinclude.m4 (--disable-newlib-supplied-syscalls): New configuration diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h index 78b3f552b..9237fda7f 100644 --- a/newlib/libc/include/sys/types.h +++ b/newlib/libc/include/sys/types.h @@ -46,10 +46,6 @@ __extension__ typedef unsigned long long __uint64_t; #define _SYS_TYPES_H #include -#if defined (_WIN32) || defined (__CYGWIN__) -#define __MS_types__ -#endif - #ifdef __i386__ #if defined (GO32) || defined (__MSDOS__) #define __MS_types__ @@ -115,6 +111,7 @@ struct itimerspec { typedef long daddr_t; typedef char * caddr_t; +#ifndef __CYGWIN__ #if defined(__MS_types__) || defined(__rtems__) typedef unsigned long ino_t; #else @@ -124,7 +121,7 @@ typedef unsigned long ino_t; typedef unsigned short ino_t; #endif #endif - +#endif /*__CYGWIN__*/ #ifdef __MS_types__ typedef unsigned long vm_offset_t; @@ -170,6 +167,7 @@ typedef int pid_t; typedef long key_t; typedef _ssize_t ssize_t; +#ifndef __CYGWIN__ #ifdef __MS_types__ typedef char * addr_t; typedef int mode_t; @@ -184,6 +182,7 @@ typedef unsigned short mode_t; typedef unsigned int mode_t _ST_INT32; #endif #endif /* ! __MS_types__ */ +#endif /*__CYGWIN__*/ typedef unsigned short nlink_t;