summaryrefslogtreecommitdiff
path: root/include/X11/Xlocale.h
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:20 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-14 16:48:20 +0000
commit917de4a98eeb9a7eafeab7ddd8e1b1ae6aae6514 (patch)
treee79f892e8545c72ddbe15d679315143e5672175d /include/X11/Xlocale.h
parentdeae12c6b683898f5213992d561a59d4ea889cca (diff)
XFree86 4.3.0.1PRE_xf86-4_3_0_1
Diffstat (limited to 'include/X11/Xlocale.h')
-rw-r--r--include/X11/Xlocale.h11
1 files changed, 2 insertions, 9 deletions
diff --git a/include/X11/Xlocale.h b/include/X11/Xlocale.h
index 77702b1..a202304 100644
--- a/include/X11/Xlocale.h
+++ b/include/X11/Xlocale.h
@@ -26,6 +26,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
+/* $XFree86: xc/lib/X11/Xlocale.h,v 1.4 2001/12/14 19:54:09 dawes Exp $ */
#ifndef _XLOCALE_H_
#define _XLOCALE_H_
@@ -34,12 +35,6 @@ from The Open Group.
#include <X11/Xosdefs.h>
#ifndef X_LOCALE
-#ifdef X_NOT_STDC_ENV
-#define X_LOCALE
-#endif
-#endif
-
-#ifndef X_LOCALE
#include <locale.h>
#else
@@ -61,9 +56,7 @@ _XFUNCPROTOEND
#define setlocale _Xsetlocale
-#ifndef NULL
-#define NULL 0
-#endif
+#include <stddef.h>
#endif /* X_LOCALE */