mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 05:54:08 +00:00
include: dont include xorg-config.h
Those public headers shouldn't ever attempt to include xorg-config.h. All xfree86 source files need to include it at the very top anyway, while drivers have to include xorg-server.h instead. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
committed by
Enrico Weigelt
parent
bb821cf041
commit
5d0dc36712
@@ -56,14 +56,9 @@
|
|||||||
* This file contains the Option Record that is passed between the Parser,
|
* This file contains the Option Record that is passed between the Parser,
|
||||||
* and Module setup procs.
|
* and Module setup procs.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _xf86Optrec_h_
|
#ifndef _xf86Optrec_h_
|
||||||
#define _xf86Optrec_h_
|
#define _xf86Optrec_h_
|
||||||
|
|
||||||
#ifdef HAVE_XORG_CONFIG_H
|
|
||||||
#include <xorg-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include "xf86Optionstr.h"
|
#include "xf86Optionstr.h"
|
||||||
|
|||||||
@@ -56,14 +56,9 @@
|
|||||||
* This file contains the external interfaces for the XFree86 configuration
|
* This file contains the external interfaces for the XFree86 configuration
|
||||||
* file parser.
|
* file parser.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef _xf86Parser_h_
|
#ifndef _xf86Parser_h_
|
||||||
#define _xf86Parser_h_
|
#define _xf86Parser_h_
|
||||||
|
|
||||||
#ifdef HAVE_XORG_CONFIG_H
|
|
||||||
#include <xorg-config.h>
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <X11/Xdefs.h>
|
#include <X11/Xdefs.h>
|
||||||
#include "xf86Optrec.h"
|
#include "xf86Optrec.h"
|
||||||
#include "list.h"
|
#include "list.h"
|
||||||
|
|||||||
@@ -23,8 +23,6 @@
|
|||||||
#ifndef _XF86_SBUS_H
|
#ifndef _XF86_SBUS_H
|
||||||
#define _XF86_SBUS_H
|
#define _XF86_SBUS_H
|
||||||
|
|
||||||
#include <xorg-config.h>
|
|
||||||
|
|
||||||
#if defined(__linux__)
|
#if defined(__linux__)
|
||||||
#include <asm/types.h>
|
#include <asm/types.h>
|
||||||
#include <linux/fb.h>
|
#include <linux/fb.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user