aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Jackson2005-11-29 21:51:46 -0600
committerAdam Jackson2005-11-29 21:51:46 -0600
commitf28dddb5515cb1c16f8c29e025195ea29d9f01d4 (patch)
treed792db5f99d0aab2190bef91c5116752d14ef264
parentea08b613bdc496b0e1aa3b723f8462d2c40ed8e5 (diff)
downloadexternal-libdrm-f28dddb5515cb1c16f8c29e025195ea29d9f01d4.tar.gz
external-libdrm-f28dddb5515cb1c16f8c29e025195ea29d9f01d4.tar.xz
external-libdrm-f28dddb5515cb1c16f8c29e025195ea29d9f01d4.zip
Resync from Xorg head: conditional include of xorg-config.h
-rw-r--r--libdrm/xf86drm.c4
-rw-r--r--libdrm/xf86drmHash.c4
-rw-r--r--libdrm/xf86drmRandom.c4
-rw-r--r--libdrm/xf86drmSL.c4
4 files changed, 16 insertions, 0 deletions
diff --git a/libdrm/xf86drm.c b/libdrm/xf86drm.c
index 4759e0fe..f1ea4fc6 100644
--- a/libdrm/xf86drm.c
+++ b/libdrm/xf86drm.c
@@ -33,6 +33,10 @@
33 33
34/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.36 2003/08/24 17:35:35 tsi Exp $ */ 34/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drm.c,v 1.36 2003/08/24 17:35:35 tsi Exp $ */
35 35
36#ifdef HAVE_XORG_CONFIG_H
37#include <xorg-config.h>
38#endif
39
36#ifdef XFree86Server 40#ifdef XFree86Server
37# include "xf86.h" 41# include "xf86.h"
38# include "xf86_OSproc.h" 42# include "xf86_OSproc.h"
diff --git a/libdrm/xf86drmHash.c b/libdrm/xf86drmHash.c
index 3ee9c028..c3e7f0d7 100644
--- a/libdrm/xf86drmHash.c
+++ b/libdrm/xf86drmHash.c
@@ -70,6 +70,10 @@
70 * 70 *
71 */ 71 */
72 72
73#ifdef HAVE_XORG_CONFIG_H
74#include <xorg-config.h>
75#endif
76
73#define HASH_MAIN 0 77#define HASH_MAIN 0
74 78
75#if HASH_MAIN 79#if HASH_MAIN
diff --git a/libdrm/xf86drmRandom.c b/libdrm/xf86drmRandom.c
index 8db57a50..301aaf4c 100644
--- a/libdrm/xf86drmRandom.c
+++ b/libdrm/xf86drmRandom.c
@@ -73,6 +73,10 @@
73 * 73 *
74 */ 74 */
75 75
76#ifdef HAVE_XORG_CONFIG_H
77#include <xorg-config.h>
78#endif
79
76#define RANDOM_MAIN 0 80#define RANDOM_MAIN 0
77 81
78#if RANDOM_MAIN 82#if RANDOM_MAIN
diff --git a/libdrm/xf86drmSL.c b/libdrm/xf86drmSL.c
index 41e36a73..5f3c88d2 100644
--- a/libdrm/xf86drmSL.c
+++ b/libdrm/xf86drmSL.c
@@ -40,6 +40,10 @@
40 * 40 *
41 */ 41 */
42 42
43#ifdef HAVE_XORG_CONFIG_H
44#include <xorg-config.h>
45#endif
46
43#define SL_MAIN 0 47#define SL_MAIN 0
44 48
45#if SL_MAIN 49#if SL_MAIN