From f87c7bd4133a2b3ad9b45c32fab33d167a348c4b Mon Sep 17 00:00:00 2001
From: "\"Steven J. Hill\"" <sjhill@realitydiluted.com>
Date: Fri, 18 Nov 2005 03:14:53 +0000
Subject: Massive merge from trunk.

---
 libc/sysdeps/linux/e1/bits/setjmp.h | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'libc/sysdeps/linux/e1/bits/setjmp.h')

diff --git a/libc/sysdeps/linux/e1/bits/setjmp.h b/libc/sysdeps/linux/e1/bits/setjmp.h
index 88ded3837..88fa76fdf 100644
--- a/libc/sysdeps/linux/e1/bits/setjmp.h
+++ b/libc/sysdeps/linux/e1/bits/setjmp.h
@@ -3,7 +3,10 @@
  *                             Yannis Mitsos <yannis.mitsos@gdt.gr>
  */
 
-#ifndef _SETJMP_H
+#ifndef _BITS_SETJMP_H
+#define _BITS_SETJMP_H	1
+
+#if !defined _SETJMP_H && !defined _PTHREAD_H
 # error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead."
 #endif
 
@@ -16,3 +19,4 @@ typedef struct {
 	unsigned long ReturnValue;
 } __jmp_buf[1];
 
+#endif	/* bits/setjmp.h */
-- 
cgit v1.2.3