[PATCH 03/14] xfree86: bus: remove xfree86 and few other references from OS files

Tiago Vignatti tiago.vignatti at nokia.com
Thu Jun 3 04:48:10 PDT 2010


Conceptually, os-support should have only a basic set of OS helpers which
wouldn't mix with any DDX common structure (e.g. windowing structures, etc)

This patch removes some xfree86-only and a few other unused references from
os-support/bus.

Signed-off-by: Tiago Vignatti <tiago.vignatti at nokia.com>
Reviewed-by: Mikhail Gusarov <dottedmag at dottedmag.net>
---
 hw/xfree86/os-support/bus/Pci.c      |   15 ---------------
 hw/xfree86/os-support/bus/linuxPci.c |    8 --------
 2 files changed, 0 insertions(+), 23 deletions(-)

diff --git a/hw/xfree86/os-support/bus/Pci.c b/hw/xfree86/os-support/bus/Pci.c
index 6e88139..05ec8ce 100644
--- a/hw/xfree86/os-support/bus/Pci.c
+++ b/hw/xfree86/os-support/bus/Pci.c
@@ -120,23 +120,8 @@
  * authorization from the copyright holder(s) and author(s).
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include <errno.h>
-#include <signal.h>
-#include "compiler.h"
-#include "xf86.h"
-#include "xf86Priv.h"
-#define XF86_OS_PRIVS
-#include "xf86_OSproc.h"
 #include "Pci.h"
 
-#include <pciaccess.h>
-
-/* Global data */
-
 PCITAG
 pciTag(int busnum, int devnum, int funcnum)
 {
diff --git a/hw/xfree86/os-support/bus/linuxPci.c b/hw/xfree86/os-support/bus/linuxPci.c
index f650ae7..28a1d9f 100644
--- a/hw/xfree86/os-support/bus/linuxPci.c
+++ b/hw/xfree86/os-support/bus/linuxPci.c
@@ -44,17 +44,9 @@
  * SOFTWARE.
  */
 
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
 #include <stdio.h>
-#include "compiler.h"
-#include "xf86.h"
-#include "xf86Priv.h"
 #include "xf86_OSlib.h"
 #include "Pci.h"
-#include <dirent.h>
 
 static const struct pci_id_match match_host_bridge = {
     PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY, PCI_MATCH_ANY,
-- 
1.7.1.226.g770c5



More information about the xorg-devel mailing list