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 | |
parent | 2a6f555053bd404e7e5721c40990da2d9db53d19 (diff) | |
download | external-libgbm-b69b42634619076d4163ae144f0154880d1928cd.tar.gz external-libgbm-b69b42634619076d4163ae144f0154880d1928cd.tar.xz external-libgbm-b69b42634619076d4163ae144f0154880d1928cd.zip |
libdrm: remove HAVE_XORG_CONFIG_H and XFree86LOADER ifdef's.
We no longer import libdrm in the xserver.
Diffstat (limited to 'libdrm')
-rw-r--r-- | libdrm/xf86drm.c | 4 | ||||
-rw-r--r-- | libdrm/xf86drm.h | 2 | ||||
-rw-r--r-- | libdrm/xf86drmHash.c | 19 | ||||
-rw-r--r-- | libdrm/xf86drmRandom.c | 19 | ||||
-rw-r--r-- | libdrm/xf86drmSL.c | 22 |
5 files changed, 11 insertions, 55 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c index 2473162b..f07e853f 100644 --- a/libdrm/xf86drm.c +++ b/libdrm/xf86drm.c | |||
@@ -31,10 +31,6 @@ | |||
31 | * DEALINGS IN THE SOFTWARE. | 31 | * DEALINGS IN THE SOFTWARE. |
32 | */ | 32 | */ |
33 | 33 | ||
34 | #ifdef HAVE_XORG_CONFIG_H | ||
35 | #include <xorg-config.h> | ||
36 | #endif | ||
37 | |||
38 | #ifdef HAVE_CONFIG_H | 34 | #ifdef HAVE_CONFIG_H |
39 | # include <config.h> | 35 | # include <config.h> |
40 | #endif | 36 | #endif |
diff --git a/libdrm/xf86drm.h b/libdrm/xf86drm.h index e84b23d7..d4260cc9 100644 --- a/libdrm/xf86drm.h +++ b/libdrm/xf86drm.h | |||
@@ -31,8 +31,6 @@ | |||
31 | * | 31 | * |
32 | */ | 32 | */ |
33 | 33 | ||
34 | /* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.26 2003/08/16 19:26:37 dawes Exp $ */ | ||
35 | |||
36 | #ifndef _XF86DRM_H_ | 34 | #ifndef _XF86DRM_H_ |
37 | #define _XF86DRM_H_ | 35 | #define _XF86DRM_H_ |
38 | 36 | ||
diff --git a/libdrm/xf86drmHash.c b/libdrm/xf86drmHash.c index a1908d09..d1ade063 100644 --- a/libdrm/xf86drmHash.c +++ b/libdrm/xf86drmHash.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/xf86drmHash.c,v 1.4 2001/03/21 18:08:54 dawes Exp $ | ||
29 | * | ||
30 | * DESCRIPTION | 28 | * DESCRIPTION |
31 | * | 29 | * |
32 | * This file contains a straightforward implementation of a fixed-sized | 30 | * This file contains a straightforward implementation of a fixed-sized |
@@ -70,25 +68,14 @@ | |||
70 | * | 68 | * |
71 | */ | 69 | */ |
72 | 70 | ||
73 | #ifdef HAVE_XORG_CONFIG_H | 71 | #include <stdio.h> |
74 | #include <xorg-config.h> | 72 | #include <stdlib.h> |
75 | #endif | ||
76 | 73 | ||
77 | #define HASH_MAIN 0 | 74 | #define HASH_MAIN 0 |
78 | 75 | ||
79 | #if HASH_MAIN | 76 | #if !HASH_MAIN |
80 | # include <stdio.h> | ||
81 | # include <stdlib.h> | ||
82 | #else | ||
83 | # include "drm.h" | 77 | # include "drm.h" |
84 | # include "xf86drm.h" | 78 | # include "xf86drm.h" |
85 | # ifdef XFree86LOADER | ||
86 | # include "xf86.h" | ||
87 | # include "xf86_ansic.h" | ||
88 | # else | ||
89 | # include <stdio.h> | ||
90 | # include <stdlib.h> | ||
91 | # endif | ||
92 | #endif | 79 | #endif |
93 | 80 | ||
94 | #define HASH_MAGIC 0xdeadbeef | 81 | #define HASH_MAGIC 0xdeadbeef |
diff --git a/libdrm/xf86drmRandom.c b/libdrm/xf86drmRandom.c index 3f5bf611..61ffb078 100644 --- a/libdrm/xf86drmRandom.c +++ b/libdrm/xf86drmRandom.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/xf86drmRandom.c,v 1.4 2000/06/17 00:03:34 martin Exp $ | ||
29 | * | ||
30 | * DESCRIPTION | 28 | * DESCRIPTION |
31 | * | 29 | * |
32 | * This file contains a simple, straightforward implementation of the Park | 30 | * This file contains a simple, straightforward implementation of the Park |
@@ -73,25 +71,14 @@ | |||
73 | * | 71 | * |
74 | */ | 72 | */ |
75 | 73 | ||
76 | #ifdef HAVE_XORG_CONFIG_H | 74 | #include <stdio.h> |
77 | #include <xorg-config.h> | 75 | #include <stdlib.h> |
78 | #endif | ||
79 | 76 | ||
80 | #define RANDOM_MAIN 0 | 77 | #define RANDOM_MAIN 0 |
81 | 78 | ||
82 | #if RANDOM_MAIN | 79 | #if !RANDOM_MAIN |
83 | # include <stdio.h> | ||
84 | # include <stdlib.h> | ||
85 | #else | ||
86 | # include "drm.h" | 80 | # include "drm.h" |
87 | # include "xf86drm.h" | 81 | # include "xf86drm.h" |
88 | # ifdef XFree86LOADER | ||
89 | # include "xf86.h" | ||
90 | # include "xf86_ansic.h" | ||
91 | # else | ||
92 | # include <stdio.h> | ||
93 | # include <stdlib.h> | ||
94 | # endif | ||
95 | #endif | 82 | #endif |
96 | 83 | ||
97 | #define RANDOM_MAGIC 0xfeedbeef | 84 | #define RANDOM_MAGIC 0xfeedbeef |
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 |