From 2f503c70ee5b61907382502e36c7433922fca0ee Mon Sep 17 00:00:00 2001
From: Kaleb Keithley <kaleb@freedesktop.org>
Date: Sat, 20 Dec 2003 00:28:32 +0000
Subject: merge XFree86 RC2 (4.3.99.902) from vendor branch

---
 lisp/private.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'lisp/private.h')

diff --git a/lisp/private.h b/lisp/private.h
index 6b78d02..fdceb21 100644
--- a/lisp/private.h
+++ b/lisp/private.h
@@ -27,15 +27,23 @@
  * Author: Paulo César Pereira de Andrade
  */
 
-/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.41 2003/05/27 22:27:04 tsi Exp $ */
+/* $XdotOrg: xc/programs/xedit/lisp/private.h,v 1.42 2003/12/17 17:45:33 dawes Exp $ */
+/* $XFree86: xc/programs/xedit/lisp/private.h,v 1.42 2003/12/17 17:45:33 dawes Exp $ */
 
 #ifndef Lisp_private_h
 #define Lisp_private_h
 
+#include <X11/Xos.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#if defined(X_POSIX_C_SOURCE)
+#define _POSIX_C_SOURCE X_POSIX_C_SOURCE
 #include <setjmp.h>
+#undef _POSIX_C_SOURCE
+#else
+#include <setjmp.h>
+#endif
 #include <unistd.h>
 #include <sys/time.h>
 #include "lisp/internal.h"
-- 
cgit v1.2.3