From: Roland McGrath <roland@gnu.org>
Date: Tue, 15 Feb 2005 00:16:39 +0000 (+0000)
Subject: [BZ #720]
X-Git-Tag: upstream/2.30~16893
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=00a78f671f381e96497e789bd951a445daf91a90;p=external%2Fglibc.git

[BZ #720]

2005-02-14  Roland McGrath  <roland@redhat.com>
	[BZ #720]
	* sysdeps/unix/sysv/linux/sys/kd.h: Don't leave _LINUX_TYPES_H defined
	if it wasn't originally.
---

diff --git a/ChangeLog b/ChangeLog
index 0dba6de..2cb7437 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-14  Roland McGrath  <roland@redhat.com>
+
+	[BZ #720]
+	* sysdeps/unix/sysv/linux/sys/kd.h: Don't leave _LINUX_TYPES_H defined
+	if it wasn't originally.
+
 2005-02-14  GOTO Masanori  <gotom@debian.or.jp>
 
 	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove the duplicated
diff --git a/sysdeps/unix/sysv/linux/sys/kd.h b/sysdeps/unix/sysv/linux/sys/kd.h
index e0d2e86..d459c07 100644
--- a/sysdeps/unix/sysv/linux/sys/kd.h
+++ b/sysdeps/unix/sysv/linux/sys/kd.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1996, 1997, 2005 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
@@ -21,9 +21,15 @@
 
 /* Make sure the <linux/types.h> header is not loaded.  */
 #ifndef _LINUX_TYPES_H
-# define _LINUX_TYPES_H	1
+# define _LINUX_TYPES_H		1
+# define __undef_LINUX_TYPES_H
 #endif
 
 #include <linux/kd.h>
 
+#ifdef __undef_LINUX_TYPES_H
+# undef _LINUX_TYPES_H
+# undef __undef_LINUX_TYPES_H
+#endif
+
 #endif	/* sys/kd.h */