summaryrefslogtreecommitdiff
path: root/src/xkbatom.c
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:42 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-11-17 19:03:42 +0000
commit452889aad6eca008ccba92e98eb8139dccea94d8 (patch)
tree980bdede3bf8457796988d83b410321d6af21b69 /src/xkbatom.c
parent52a8406aaba4ed1f9fa5e78bfa5da7af659bce01 (diff)
merge XFree86 4.3.0.1 to -CURRENT
Diffstat (limited to 'src/xkbatom.c')
-rw-r--r--src/xkbatom.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/xkbatom.c b/src/xkbatom.c
index 30675d1..2883cac 100644
--- a/src/xkbatom.c
+++ b/src/xkbatom.c
@@ -71,12 +71,11 @@ SOFTWARE.
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
+/* $XFree86: xc/lib/xkbfile/xkbatom.c,v 3.8 2001/12/14 19:57:03 dawes Exp $ */
#include <stdio.h>
#include <ctype.h>
-#ifndef X_NOT_STDC_ENV
#include <stdlib.h>
-#endif
#include <X11/Xos.h>
#include <X11/Xlib.h>
#include <X11/XKBlib.h>