geemili
/
drm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libdrm: remove HAVE_XORG_CONFIG_H and XFree86LOADER ifdef's. 

We no longer import libdrm in the xserver.
main
George Sapountzis 2007-04-26 14:15:55 +03:00
parent 2a6f555053
commit b69b426346
5 changed files with 11 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libdrm/xf86drm.c
View File

@ -31,10 +31,6 @@
* DEALINGS IN THE SOFTWARE. * DEALINGS IN THE SOFTWARE.
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
# include <config.h> # include <config.h>
#endif #endif

2
libdrm/xf86drm.h
View File

@ -31,8 +31,6 @@
* *
*/ */
/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86drm.h,v 1.26 2003/08/16 19:26:37 dawes Exp $ */
#ifndef _XF86DRM_H_ #ifndef _XF86DRM_H_
#define _XF86DRM_H_ #define _XF86DRM_H_

19
libdrm/xf86drmHash.c
View File

@ -25,8 +25,6 @@
* *
* Authors: Rickard E. (Rik) Faith <faith@valinux.com> * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
* *
* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmHash.c,v 1.4 2001/03/21 18:08:54 dawes Exp $
*
* DESCRIPTION * DESCRIPTION
* *
* This file contains a straightforward implementation of a fixed-sized * This file contains a straightforward implementation of a fixed-sized
@ -70,25 +68,14 @@
* *
*/ */
#ifdef HAVE_XORG_CONFIG_H #include <stdio.h>
#include <xorg-config.h> #include <stdlib.h>
#endif
#define HASH_MAIN 0 #define HASH_MAIN 0
#if HASH_MAIN #if !HASH_MAIN
# include <stdio.h>
# include <stdlib.h>
#else
# include "drm.h" # include "drm.h"
# include "xf86drm.h" # include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h"
# include "xf86_ansic.h"
# else
# include <stdio.h>
# include <stdlib.h>
# endif
#endif #endif
#define HASH_MAGIC 0xdeadbeef #define HASH_MAGIC 0xdeadbeef

19
libdrm/xf86drmRandom.c
View File

@ -25,8 +25,6 @@
* *
* Authors: Rickard E. (Rik) Faith <faith@valinux.com> * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
* *
* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmRandom.c,v 1.4 2000/06/17 00:03:34 martin Exp $
*
* DESCRIPTION * DESCRIPTION
* *
* This file contains a simple, straightforward implementation of the Park * This file contains a simple, straightforward implementation of the Park
@ -73,25 +71,14 @@
* *
*/ */
#ifdef HAVE_XORG_CONFIG_H #include <stdio.h>
#include <xorg-config.h> #include <stdlib.h>
#endif
#define RANDOM_MAIN 0 #define RANDOM_MAIN 0
#if RANDOM_MAIN #if !RANDOM_MAIN
# include <stdio.h>
# include <stdlib.h>
#else
# include "drm.h" # include "drm.h"
# include "xf86drm.h" # include "xf86drm.h"
# ifdef XFree86LOADER
# include "xf86.h"
# include "xf86_ansic.h"
# else
# include <stdio.h>
# include <stdlib.h>
# endif
#endif #endif
#define RANDOM_MAGIC 0xfeedbeef #define RANDOM_MAGIC 0xfeedbeef

22
libdrm/xf86drmSL.c
View File

@ -25,8 +25,6 @@
* *
* Authors: Rickard E. (Rik) Faith <faith@valinux.com> * Authors: Rickard E. (Rik) Faith <faith@valinux.com>
* *
* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/linux/drm/xf86drmSL.c,v 1.3 2000/06/17 00:03:34 martin Exp $
*
* DESCRIPTION * DESCRIPTION
* *
* This file contains a straightforward skip list implementation.n * This file contains a straightforward skip list implementation.n
@ -40,26 +38,16 @@
* *
*/ */
#ifdef HAVE_XORG_CONFIG_H #include <stdio.h>
#include <xorg-config.h> #include <stdlib.h>
#endif
#define SL_MAIN 0 #define SL_MAIN 0
#if SL_MAIN #if !SL_MAIN
# include <stdio.h>
# include <stdlib.h>
# include <sys/time.h>
#else
# include "drm.h" # include "drm.h"
# include "xf86drm.h" # include "xf86drm.h"
# ifdef XFree86LOADER #else
# include "xf86.h" # include <sys/time.h>
# include "xf86_ansic.h"
# else
# include <stdio.h>
# include <stdlib.h>
# endif
#endif #endif
#define SL_LIST_MAGIC 0xfacade00LU #define SL_LIST_MAGIC 0xfacade00LU