From f8c1b120d49dc9a19a7e392d0e5d2cc4015f818b Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Mon, 11 Jan 2010 21:00:23 -0800
Subject: [PATCH] Fix up termios.h for XPG7.

---
 ChangeLog         | 2 ++
 termios/termios.h | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 250195841e..003377eb19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 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.
 
diff --git a/termios/termios.h b/termios/termios.h
index 9698b1fbd0..fdde6d3526 100644
--- 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
@@ -24,7 +24,7 @@
 #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