[MinGW-cvs] msys/rt/src/winsup/msys/include/sys acl.h,1.1.1.1,1.1.1.1.2.1 mtio.h,1.1.1.1,1.1.1.1.2.1 procfs.h,1.1.1.1,1.1.1.1.2.1 socket.h,1.1.1.1,1.1.1.1.2.1 termios.h,1.1.1.1,1.1.1.1.2.1

[<ea...@us...>]

Update of /cvsroot/mingw/msys/rt/src/winsup/msys/include/sys
In directory sc8-pr-cvs1:/tmp/cvs-serv29722/include/sys

Modified Files:
      Tag: r1_1_0
	acl.h mtio.h procfs.h socket.h termios.h 
Log Message:
Merge changes from HEAD

Index: acl.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/msys/include/sys/acl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** acl.h	11 Dec 2002 00:17:13 -0000	1.1.1.1
--- acl.h	24 Feb 2003 22:06:09 -0000	1.1.1.1.2.1
***************
*** 13,17 ****
  #define _SYS_ACL_H
  
! #include <cygwin/acl.h>
  
  #endif /* _SYS_ACL_H */
--- 13,17 ----
  #define _SYS_ACL_H
  
! #include <msys/acl.h>
  
  #endif /* _SYS_ACL_H */

Index: mtio.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/msys/include/sys/mtio.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** mtio.h	11 Dec 2002 00:17:13 -0000	1.1.1.1
--- mtio.h	24 Feb 2003 22:06:12 -0000	1.1.1.1.2.1
***************
*** 14,18 ****
  #define _SYS_MTIO_H
  
! #include <cygwin/mtio.h>
  
  #endif /* _SYS_MTIO_H */
--- 14,18 ----
  #define _SYS_MTIO_H
  
! #include <msys/mtio.h>
  
  #endif /* _SYS_MTIO_H */

Index: procfs.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/msys/include/sys/procfs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** procfs.h	11 Dec 2002 00:17:13 -0000	1.1.1.1
--- procfs.h	24 Feb 2003 22:06:15 -0000	1.1.1.1.2.1
***************
*** 14,18 ****
  #define _SYS_PROCFS_H
  
! #include <cygwin/core_dump.h>
  
  #endif /* _SYS_PROCFS_H */
--- 14,18 ----
  #define _SYS_PROCFS_H
  
! #include <msys/core_dump.h>
  
  #endif /* _SYS_PROCFS_H */

Index: socket.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/msys/include/sys/socket.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** socket.h	11 Dec 2002 00:17:13 -0000	1.1.1.1
--- socket.h	24 Feb 2003 22:06:17 -0000	1.1.1.1.2.1
***************
*** 13,17 ****
  
  #include <features.h>
! #include <cygwin/socket.h>
  #include <sys/time.h>
  
--- 13,17 ----
  
  #include <features.h>
! #include <msys/socket.h>
  #include <sys/time.h>
  

Index: termios.h
===================================================================
RCS file: /cvsroot/mingw/msys/rt/src/winsup/msys/include/sys/termios.h,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.1.2.1
diff -C2 -d -r1.1.1.1 -r1.1.1.1.2.1
*** termios.h	11 Dec 2002 00:17:14 -0000	1.1.1.1
--- termios.h	24 Feb 2003 22:06:18 -0000	1.1.1.1.2.1
***************
*** 224,273 ****
  };
  
- #ifdef CYGWIN_VERSION_DLL_IS_OLD_TERMIOS
- #ifdef __GNUC__
  # define __tonew_termios(ti) \
    ({ \
      struct termios *__newti; \
!    \
!     if (!CYGWIN_VERSION_DLL_IS_OLD_TERMIOS) \
!       __newti = (struct termios *) ti; \
!     else \
!       { \
! 	__newti = (struct termios *) alloca(sizeof(struct termios)); \
! 	__newti->c_iflag = ((struct __oldtermios *)ti)->c_iflag; \
! 	__newti->c_oflag = ((struct __oldtermios *)ti)->c_oflag; \
! 	__newti->c_cflag = ((struct __oldtermios *)ti)->c_cflag; \
! 	__newti->c_lflag = ((struct __oldtermios *)ti)->c_lflag; \
! 	__newti->c_line = ((struct __oldtermios *)ti)->c_line; \
! 	__newti->c_ispeed = ((struct __oldtermios *)ti)->c_ispeed; \
! 	__newti->c_ospeed = ((struct __oldtermios *)ti)->c_ospeed; \
! 	memcpy (__newti->c_cc, ((struct __oldtermios *)ti)->c_cc, sizeof(__newti->c_cc)); \
!       } \
      __newti; \
    })
  
! # define __makenew_termios(ti) \
!   (CYGWIN_VERSION_DLL_IS_OLD_TERMIOS ? \
!    (struct termios *) alloca (sizeof (struct termios)) : (ti))
  
  # define __toapp_termios(toti, fromti) \
    ({ \
!     if (!CYGWIN_VERSION_DLL_IS_OLD_TERMIOS) \
!       toti = fromti; \
!     else \
!       { \
! 	((struct __oldtermios *)toti)->c_iflag = fromti->c_iflag; \
! 	((struct __oldtermios *)toti)->c_oflag = fromti->c_oflag; \
! 	((struct __oldtermios *)toti)->c_cflag = fromti->c_cflag; \
! 	((struct __oldtermios *)toti)->c_lflag = fromti->c_lflag; \
! 	((struct __oldtermios *)toti)->c_line = fromti->c_line; \
! 	((struct __oldtermios *)toti)->c_ispeed = fromti->c_ispeed; \
! 	((struct __oldtermios *)toti)->c_ospeed = fromti->c_ospeed; \
! 	memcpy (((struct __oldtermios*)toti)->c_cc, fromti->c_cc, sizeof(fromti->c_cc)); \
!       } \
      toti; \
    })
- #endif /*__GNUC__*/
- #endif
  
  #define termio termios
--- 224,241 ----
  };
  
  # define __tonew_termios(ti) \
    ({ \
      struct termios *__newti; \
!     __newti = (struct termios *) ti; \
      __newti; \
    })
  
! # define __makenew_termios(ti) ((ti))
  
  # define __toapp_termios(toti, fromti) \
    ({ \
!     toti = fromti; \
      toti; \
    })
  
  #define termio termios