diff options
author | George Sapountzis | 2007-04-26 06:15:55 -0500 |
---|---|---|
committer | George Sapountzis | 2007-04-26 06:15:55 -0500 |
commit | b69b42634619076d4163ae144f0154880d1928cd (patch) | |
tree | e85e6a580c0a2dd7df866539cc14a157286a43b4 /libdrm/xf86drmSL.c | |
parent | 2a6f555053bd404e7e5721c40990da2d9db53d19 (diff) | |
download | libdrm-b69b42634619076d4163ae144f0154880d1928cd.tar.gz libdrm-b69b42634619076d4163ae144f0154880d1928cd.tar.xz libdrm-b69b42634619076d4163ae144f0154880d1928cd.zip |
libdrm: remove HAVE_XORG_CONFIG_H and XFree86LOADER ifdef's.
We no longer import libdrm in the xserver.
Diffstat (limited to 'libdrm/xf86drmSL.c')
-rw-r--r-- | libdrm/xf86drmSL.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/libdrm/xf86drmSL.c b/libdrm/xf86drmSL.c index ab2cc098..ce60648d 100644 --- a/libdrm/xf86drmSL.c +++ b/libdrm/xf86drmSL.c | |||
@@ -25,8 +25,6 @@ | |||
25 | * | 25 | * |
26 | * Authors: Rickard E. (Rik) Faith <faith@valinux.com> | 26 | * Authors: Rickard E. (Rik) Faith <faith@valinux.com> |
27 | * | 27 | * |
28 | * $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.3 2000/06/17 00:03:34 martin Exp $ | ||
29 | * | ||
30 | * DESCRIPTION | 28 | * DESCRIPTION |
31 | * | 29 | * |
32 | * This file contains a straightforward skip list implementation.n | 30 | * This file contains a straightforward skip list implementation.n |
@@ -40,26 +38,16 @@ | |||
40 | * | 38 | * |
41 | */ | 39 | */ |
42 | 40 | ||
43 | #ifdef HAVE_XORG_CONFIG_H | 41 | #include <stdio.h> |
44 | #include <xorg-config.h> | 42 | #include <stdlib.h> |
45 | #endif | ||
46 | 43 | ||
47 | #define SL_MAIN 0 | 44 | #define SL_MAIN 0 |
48 | 45 | ||
49 | #if SL_MAIN | 46 | #if !SL_MAIN |
50 | # include <stdio.h> | ||
51 | # include <stdlib.h> | ||
52 | # include <sys/time.h> | ||
53 | #else | ||
54 | # include "drm.h" | 47 | # include "drm.h" |
55 | # include "xf86drm.h" | 48 | # include "xf86drm.h" |
56 | # ifdef XFree86LOADER | 49 | #else |
57 | # include "xf86.h" | 50 | # include <sys/time.h> |
58 | # include "xf86_ansic.h" | ||
59 | # else | ||
60 | # include <stdio.h> | ||
61 | # include <stdlib.h> | ||
62 | # endif | ||
63 | #endif | 51 | #endif |
64 | 52 | ||
65 | #define SL_LIST_MAGIC 0xfacade00LU | 53 | #define SL_LIST_MAGIC 0xfacade00LU |