aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2010-01-11 21:00:23 -0800
committerUlrich Drepper <drepper@redhat.com>2010-01-11 21:00:23 -0800
commitf8c1b120d49dc9a19a7e392d0e5d2cc4015f818b (patch)
tree5710c8dc0f98dd1c285729b23d548edfa9a5df82
parent91251b7f5421e94cd4e05ebc20b9396233574c3f (diff)
downloadglibc-f8c1b120d49dc9a19a7e392d0e5d2cc4015f818b.tar
glibc-f8c1b120d49dc9a19a7e392d0e5d2cc4015f818b.tar.gz
glibc-f8c1b120d49dc9a19a7e392d0e5d2cc4015f818b.tar.bz2
glibc-f8c1b120d49dc9a19a7e392d0e5d2cc4015f818b.zip
Fix up termios.h for XPG7.
-rw-r--r--ChangeLog2
-rw-r--r--termios/termios.h4
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