Fix up termios.h for XPG7.

diff --git a/ChangeLog b/ChangeLog
index 2501958..003377e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2010-01-11  Ulrich Drepper  <drepper@redhat.com>
 
 2010-01-11  Ulrich Drepper  <drepper@redhat.com>
 

+       * termios/termios.h: Define pid_t for XPG7.
+

        * conform/data/math.h-data: Fix up for XPG6 and XPG7.
        * conform/data/tgmath.h-data: Likewise.
 
        * conform/data/math.h-data: Fix up for XPG6 and XPG7.
        * conform/data/tgmath.h-data: Likewise.
 

diff --git a/termios/termios.h b/termios/termios.h
index 9698b1f..fdde6d3 100644 (file)
--- a/termios/termios.h
+++ b/termios/termios.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,96,97,98,99, 2003 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1994,1996-1999,2003,2010 Free Software Foundation, Inc.

    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or


@@ -24,7 +24,7 @@
 #define        _TERMIOS_H      1
 
 #include <features.h>
 #define        _TERMIOS_H      1
 
 #include <features.h>

-#ifdef __USE_UNIX98
+#if defined __USE_UNIX98 || defined __USE_XOPEN2K8

 /* We need `pid_t'.  */
 # include <bits/types.h>
 # ifndef __pid_t_defined
 /* We need `pid_t'.  */
 # include <bits/types.h>
 # ifndef __pid_t_defined