[Glibc-bsd-commits] r2327 - in trunk/glibc-ports/kfreebsd: . bits

[ps-guest at alioth.debian.org]

Author: ps-guest
Date: 2008-11-10 20:39:31 +0000 (Mon, 10 Nov 2008)
New Revision: 2327

Modified:
   trunk/glibc-ports/kfreebsd/bits/ioctl-types.h
   trunk/glibc-ports/kfreebsd/bits/termios.h
   trunk/glibc-ports/kfreebsd/gtty.c
   trunk/glibc-ports/kfreebsd/stty.c
Log:
2nd part of termios cleanup



Modified: trunk/glibc-ports/kfreebsd/bits/ioctl-types.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/ioctl-types.h	2008-11-10 15:40:03 UTC (rev 2326)
+++ trunk/glibc-ports/kfreebsd/bits/ioctl-types.h	2008-11-10 20:39:31 UTC (rev 2327)
@@ -21,26 +21,6 @@
 # error "Never use <bits/ioctl-types.h> directly; include <sys/ioctl.h> instead."
 #endif
 
-/* Type of ARG for TIOCGETC and TIOCSETC requests.  */
-/* struct tchars is defined in <sys/ioctl_compat.h> */
-#define	_IOT_tchars	/* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (char), 6, 0, 0, 0, 0)
-
-/* Type of ARG for TIOCGLTC and TIOCSLTC requests.  */
-/* struct ltchars is defined in <sys/ioctl_compat.h> */ 
-#define	_IOT_ltchars	/* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (char), 6, 0, 0, 0, 0)
-
-/* Type of ARG for TIOCGETP and TIOCSETP requests (and gtty and stty).  */
-/* struct sgttyb  is defined in <sys/ioctl_compat.h> */
-#define	_IOT_sgttyb	/* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (char), 6, _IOTS (short int), 1, 0, 0)
-
-/* Type of ARG for TIOCGWINSZ and TIOCSWINSZ requests.  */
-/* struct winsize is defined in <sys/ttycom.h> */
-#define	_IOT_winsize	/* Hurd ioctl type field.  */ \
-  _IOT (_IOTS (unsigned short int), 4, 0, 0, 0, 0)
-
 /* Many systems that have TIOCGWINSZ define TIOCGSIZE for source
    compatibility with Sun; they define `struct ttysize' to have identical
    layout as `struct winsize' and #define TIOCGSIZE to be TIOCGWINSZ

Modified: trunk/glibc-ports/kfreebsd/bits/termios.h
===================================================================
--- trunk/glibc-ports/kfreebsd/bits/termios.h	2008-11-10 15:40:03 UTC (rev 2326)
+++ trunk/glibc-ports/kfreebsd/bits/termios.h	2008-11-10 20:39:31 UTC (rev 2327)
@@ -70,6 +70,8 @@
     cc_t c_cc[NCCS];            /* control characters */
     speed_t c_ispeed;           /* input speed */
     speed_t c_ospeed;           /* output speed */
+#define __ispeed c_ispeed
+#define __ospeed c_ospeed
 #define _HAVE_STRUCT_TERMIOS_C_ISPEED 1
 #define _HAVE_STRUCT_TERMIOS_C_OSPEED 1
 };
@@ -193,7 +195,6 @@
 #define	VSTOP	13		/* Stop (X-OFF) character [IXON, IXOFF].  */
 #define VLNEXT	14		/* Literal-next character [IEXTEN].  */
 #define VDISCARD 15		/* Discard character [IEXTEN].  */
-#endif
 #define	VMIN	16		/* Minimum number of bytes read at once [!ICANON].  */
 #define	VTIME	17		/* Time-out value (tenths of a second) [!ICANON].  */
 #ifdef	__USE_BSD

Modified: trunk/glibc-ports/kfreebsd/gtty.c
===================================================================
--- trunk/glibc-ports/kfreebsd/gtty.c	2008-11-10 15:40:03 UTC (rev 2326)
+++ trunk/glibc-ports/kfreebsd/gtty.c	2008-11-10 20:39:31 UTC (rev 2327)
@@ -1,3 +1,2 @@
-/* just use internal functions */
-#define ioctl __ioctl
-#include <sysdeps/unix/bsd/gtty.c>
+/* use stub only variant */
+#include <misc/gtty.c>

Modified: trunk/glibc-ports/kfreebsd/stty.c
===================================================================
--- trunk/glibc-ports/kfreebsd/stty.c	2008-11-10 15:40:03 UTC (rev 2326)
+++ trunk/glibc-ports/kfreebsd/stty.c	2008-11-10 20:39:31 UTC (rev 2327)
@@ -1,3 +1,2 @@
-/* just use internal functions */
-#define ioctl __ioctl
-#include <sysdeps/unix/bsd/stty.c>
+/* use stub only variant */                                   
+#include <misc/stty.c>