summaryrefslogtreecommitdiff
path: root/Xincludes
diff options
context:
space:
mode:
authorPeter Osterlund <petero2@telia.com>2004-02-09 22:54:39 +0100
committerPeter Osterlund <petero2@telia.com>2006-04-09 04:01:46 +0200
commitf62c15b07dcceacd328cd1a2f4f966fad4122063 (patch)
treea17920c2c08a7c41c80abd64edc3ae2c4f5098fa /Xincludes
parent6935b77b82842f377dfeb2d59b39e4345be846dd (diff)
Automatically build using the 4.3 SDK if available. Patch
from Paul Bender <pbender@qualcomm.com>.
Diffstat (limited to 'Xincludes')
-rw-r--r--Xincludes/usr/X11R6/include/X11/Xalloca.h (renamed from Xincludes/xc/exports/include/X11/Xalloca.h)0
-rw-r--r--Xincludes/usr/X11R6/include/X11/Xdefs.h (renamed from Xincludes/xc/exports/include/X11/Xdefs.h)0
-rw-r--r--Xincludes/usr/X11R6/include/X11/Xfuncproto.h (renamed from Xincludes/xc/exports/include/X11/Xfuncproto.h)0
-rw-r--r--Xincludes/usr/X11R6/include/X11/Xfuncs.h (renamed from Xincludes/xc/exports/include/X11/Xfuncs.h)0
-rw-r--r--Xincludes/usr/X11R6/include/X11/extensions/XI.h (renamed from Xincludes/xc/exports/include/X11/extensions/XI.h)0
-rw-r--r--Xincludes/usr/X11R6/include/X11/extensions/XIproto.h (renamed from Xincludes/xc/exports/include/X11/extensions/XIproto.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/X.h (renamed from Xincludes/xc/exports/include/X11/X.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/XIstubs.h (renamed from Xincludes/xc/programs/Xserver/include/XIstubs.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/Xmd.h (renamed from Xincludes/xc/exports/include/X11/Xmd.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/Xosdefs.h (renamed from Xincludes/xc/exports/include/X11/Xosdefs.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/Xproto.h (renamed from Xincludes/xc/exports/include/X11/Xproto.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/Xprotostr.h (renamed from Xincludes/xc/exports/include/X11/Xprotostr.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/bstore.h (renamed from Xincludes/xc/programs/Xserver/include/bstore.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/bstorestr.h (renamed from Xincludes/xc/programs/Xserver/include/bstorestr.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/colormap.h (renamed from Xincludes/xc/programs/Xserver/include/colormap.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/cursor.h (renamed from Xincludes/xc/programs/Xserver/include/cursor.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/dix.h (renamed from Xincludes/xc/programs/Xserver/include/dix.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/dixstruct.h (renamed from Xincludes/xc/programs/Xserver/include/dixstruct.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/exevents.h (renamed from Xincludes/xc/programs/Xserver/include/exevents.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/gc.h (renamed from Xincludes/xc/programs/Xserver/include/gc.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/globals.h (renamed from Xincludes/xc/programs/Xserver/include/globals.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/input.h (renamed from Xincludes/xc/programs/Xserver/include/input.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/inputstr.h (renamed from Xincludes/xc/programs/Xserver/include/inputstr.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/mipointer.h (renamed from Xincludes/xc/programs/Xserver/mi/mipointer.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/misc.h (renamed from Xincludes/xc/programs/Xserver/include/misc.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/miscstruct.h (renamed from Xincludes/xc/programs/Xserver/include/miscstruct.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/opaque.h (renamed from Xincludes/xc/programs/Xserver/include/opaque.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/os.h (renamed from Xincludes/xc/programs/Xserver/include/os.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/pixmap.h (renamed from Xincludes/xc/programs/Xserver/include/pixmap.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/pixmapstr.h (renamed from Xincludes/xc/programs/Xserver/include/pixmapstr.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/property.h (renamed from Xincludes/xc/programs/Xserver/include/property.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/propertyst.h (renamed from Xincludes/xc/programs/Xserver/include/propertyst.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/region.h (renamed from Xincludes/xc/programs/Xserver/include/region.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/regionstr.h (renamed from Xincludes/xc/programs/Xserver/include/regionstr.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/resource.h (renamed from Xincludes/xc/programs/Xserver/include/resource.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/screenint.h (renamed from Xincludes/xc/programs/Xserver/include/screenint.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/scrnintstr.h (renamed from Xincludes/xc/programs/Xserver/include/scrnintstr.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/validate.h (renamed from Xincludes/xc/programs/Xserver/include/validate.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/window.h (renamed from Xincludes/xc/programs/Xserver/include/window.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86Module.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Module.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86Opt.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Opt.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86Version.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Version.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86Xinput.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86_OSproc.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86_ansic.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86_libc.h (renamed from Xincludes/xc/programs/Xserver/include/xf86_libc.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xf86str.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86str.h)0
-rw-r--r--Xincludes/usr/X11R6/lib/Server/include/xisb.h (renamed from Xincludes/xc/programs/Xserver/hw/xfree86/common/xisb.h)0
-rw-r--r--Xincludes/xc/programs/Xserver/include/xf86_ansic.h342
50 files changed, 0 insertions, 342 deletions
diff --git a/Xincludes/xc/exports/include/X11/Xalloca.h b/Xincludes/usr/X11R6/include/X11/Xalloca.h
index 9ffbab6..9ffbab6 100644
--- a/Xincludes/xc/exports/include/X11/Xalloca.h
+++ b/Xincludes/usr/X11R6/include/X11/Xalloca.h
diff --git a/Xincludes/xc/exports/include/X11/Xdefs.h b/Xincludes/usr/X11R6/include/X11/Xdefs.h
index 9e77e30..9e77e30 100644
--- a/Xincludes/xc/exports/include/X11/Xdefs.h
+++ b/Xincludes/usr/X11R6/include/X11/Xdefs.h
diff --git a/Xincludes/xc/exports/include/X11/Xfuncproto.h b/Xincludes/usr/X11R6/include/X11/Xfuncproto.h
index dcb0140..dcb0140 100644
--- a/Xincludes/xc/exports/include/X11/Xfuncproto.h
+++ b/Xincludes/usr/X11R6/include/X11/Xfuncproto.h
diff --git a/Xincludes/xc/exports/include/X11/Xfuncs.h b/Xincludes/usr/X11R6/include/X11/Xfuncs.h
index 77acedf..77acedf 100644
--- a/Xincludes/xc/exports/include/X11/Xfuncs.h
+++ b/Xincludes/usr/X11R6/include/X11/Xfuncs.h
diff --git a/Xincludes/xc/exports/include/X11/extensions/XI.h b/Xincludes/usr/X11R6/include/X11/extensions/XI.h
index c710e0a..c710e0a 100644
--- a/Xincludes/xc/exports/include/X11/extensions/XI.h
+++ b/Xincludes/usr/X11R6/include/X11/extensions/XI.h
diff --git a/Xincludes/xc/exports/include/X11/extensions/XIproto.h b/Xincludes/usr/X11R6/include/X11/extensions/XIproto.h
index 1da0248..1da0248 100644
--- a/Xincludes/xc/exports/include/X11/extensions/XIproto.h
+++ b/Xincludes/usr/X11R6/include/X11/extensions/XIproto.h
diff --git a/Xincludes/xc/exports/include/X11/X.h b/Xincludes/usr/X11R6/lib/Server/include/X.h
index 56bcc8f..56bcc8f 100644
--- a/Xincludes/xc/exports/include/X11/X.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/X.h
diff --git a/Xincludes/xc/programs/Xserver/include/XIstubs.h b/Xincludes/usr/X11R6/lib/Server/include/XIstubs.h
index 27621d1..27621d1 100644
--- a/Xincludes/xc/programs/Xserver/include/XIstubs.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/XIstubs.h
diff --git a/Xincludes/xc/exports/include/X11/Xmd.h b/Xincludes/usr/X11R6/lib/Server/include/Xmd.h
index 6d2cf3b..6d2cf3b 100644
--- a/Xincludes/xc/exports/include/X11/Xmd.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/Xmd.h
diff --git a/Xincludes/xc/exports/include/X11/Xosdefs.h b/Xincludes/usr/X11R6/lib/Server/include/Xosdefs.h
index 85bdf1d..85bdf1d 100644
--- a/Xincludes/xc/exports/include/X11/Xosdefs.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/Xosdefs.h
diff --git a/Xincludes/xc/exports/include/X11/Xproto.h b/Xincludes/usr/X11R6/lib/Server/include/Xproto.h
index cb6b79f..cb6b79f 100644
--- a/Xincludes/xc/exports/include/X11/Xproto.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/Xproto.h
diff --git a/Xincludes/xc/exports/include/X11/Xprotostr.h b/Xincludes/usr/X11R6/lib/Server/include/Xprotostr.h
index f343d98..f343d98 100644
--- a/Xincludes/xc/exports/include/X11/Xprotostr.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/Xprotostr.h
diff --git a/Xincludes/xc/programs/Xserver/include/bstore.h b/Xincludes/usr/X11R6/lib/Server/include/bstore.h
index 098abcd..098abcd 100644
--- a/Xincludes/xc/programs/Xserver/include/bstore.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/bstore.h
diff --git a/Xincludes/xc/programs/Xserver/include/bstorestr.h b/Xincludes/usr/X11R6/lib/Server/include/bstorestr.h
index 135cefe..135cefe 100644
--- a/Xincludes/xc/programs/Xserver/include/bstorestr.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/bstorestr.h
diff --git a/Xincludes/xc/programs/Xserver/include/colormap.h b/Xincludes/usr/X11R6/lib/Server/include/colormap.h
index 5c5a80f..5c5a80f 100644
--- a/Xincludes/xc/programs/Xserver/include/colormap.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/colormap.h
diff --git a/Xincludes/xc/programs/Xserver/include/cursor.h b/Xincludes/usr/X11R6/lib/Server/include/cursor.h
index f50c389..f50c389 100644
--- a/Xincludes/xc/programs/Xserver/include/cursor.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/cursor.h
diff --git a/Xincludes/xc/programs/Xserver/include/dix.h b/Xincludes/usr/X11R6/lib/Server/include/dix.h
index 3c789c4..3c789c4 100644
--- a/Xincludes/xc/programs/Xserver/include/dix.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/dix.h
diff --git a/Xincludes/xc/programs/Xserver/include/dixstruct.h b/Xincludes/usr/X11R6/lib/Server/include/dixstruct.h
index 3ee2ad1..3ee2ad1 100644
--- a/Xincludes/xc/programs/Xserver/include/dixstruct.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/dixstruct.h
diff --git a/Xincludes/xc/programs/Xserver/include/exevents.h b/Xincludes/usr/X11R6/lib/Server/include/exevents.h
index 941cf91..941cf91 100644
--- a/Xincludes/xc/programs/Xserver/include/exevents.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/exevents.h
diff --git a/Xincludes/xc/programs/Xserver/include/gc.h b/Xincludes/usr/X11R6/lib/Server/include/gc.h
index 4920f84..4920f84 100644
--- a/Xincludes/xc/programs/Xserver/include/gc.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/gc.h
diff --git a/Xincludes/xc/programs/Xserver/include/globals.h b/Xincludes/usr/X11R6/lib/Server/include/globals.h
index c193829..c193829 100644
--- a/Xincludes/xc/programs/Xserver/include/globals.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/globals.h
diff --git a/Xincludes/xc/programs/Xserver/include/input.h b/Xincludes/usr/X11R6/lib/Server/include/input.h
index 6216f03..6216f03 100644
--- a/Xincludes/xc/programs/Xserver/include/input.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/input.h
diff --git a/Xincludes/xc/programs/Xserver/include/inputstr.h b/Xincludes/usr/X11R6/lib/Server/include/inputstr.h
index 35ade32..35ade32 100644
--- a/Xincludes/xc/programs/Xserver/include/inputstr.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/inputstr.h
diff --git a/Xincludes/xc/programs/Xserver/mi/mipointer.h b/Xincludes/usr/X11R6/lib/Server/include/mipointer.h
index f8e7fd0..f8e7fd0 100644
--- a/Xincludes/xc/programs/Xserver/mi/mipointer.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/mipointer.h
diff --git a/Xincludes/xc/programs/Xserver/include/misc.h b/Xincludes/usr/X11R6/lib/Server/include/misc.h
index 1afebb1..1afebb1 100644
--- a/Xincludes/xc/programs/Xserver/include/misc.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/misc.h
diff --git a/Xincludes/xc/programs/Xserver/include/miscstruct.h b/Xincludes/usr/X11R6/lib/Server/include/miscstruct.h
index 13ae26b..13ae26b 100644
--- a/Xincludes/xc/programs/Xserver/include/miscstruct.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/miscstruct.h
diff --git a/Xincludes/xc/programs/Xserver/include/opaque.h b/Xincludes/usr/X11R6/lib/Server/include/opaque.h
index 2ca7e2e..2ca7e2e 100644
--- a/Xincludes/xc/programs/Xserver/include/opaque.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/opaque.h
diff --git a/Xincludes/xc/programs/Xserver/include/os.h b/Xincludes/usr/X11R6/lib/Server/include/os.h
index fca3a17..fca3a17 100644
--- a/Xincludes/xc/programs/Xserver/include/os.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/os.h
diff --git a/Xincludes/xc/programs/Xserver/include/pixmap.h b/Xincludes/usr/X11R6/lib/Server/include/pixmap.h
index 7660910..7660910 100644
--- a/Xincludes/xc/programs/Xserver/include/pixmap.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/pixmap.h
diff --git a/Xincludes/xc/programs/Xserver/include/pixmapstr.h b/Xincludes/usr/X11R6/lib/Server/include/pixmapstr.h
index d84ae79..d84ae79 100644
--- a/Xincludes/xc/programs/Xserver/include/pixmapstr.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/pixmapstr.h
diff --git a/Xincludes/xc/programs/Xserver/include/property.h b/Xincludes/usr/X11R6/lib/Server/include/property.h
index 21ce949..21ce949 100644
--- a/Xincludes/xc/programs/Xserver/include/property.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/property.h
diff --git a/Xincludes/xc/programs/Xserver/include/propertyst.h b/Xincludes/usr/X11R6/lib/Server/include/propertyst.h
index 177fca1..177fca1 100644
--- a/Xincludes/xc/programs/Xserver/include/propertyst.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/propertyst.h
diff --git a/Xincludes/xc/programs/Xserver/include/region.h b/Xincludes/usr/X11R6/lib/Server/include/region.h
index 64f0ff4..64f0ff4 100644
--- a/Xincludes/xc/programs/Xserver/include/region.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/region.h
diff --git a/Xincludes/xc/programs/Xserver/include/regionstr.h b/Xincludes/usr/X11R6/lib/Server/include/regionstr.h
index 2212058..2212058 100644
--- a/Xincludes/xc/programs/Xserver/include/regionstr.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/regionstr.h
diff --git a/Xincludes/xc/programs/Xserver/include/resource.h b/Xincludes/usr/X11R6/lib/Server/include/resource.h
index c167204..c167204 100644
--- a/Xincludes/xc/programs/Xserver/include/resource.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/resource.h
diff --git a/Xincludes/xc/programs/Xserver/include/screenint.h b/Xincludes/usr/X11R6/lib/Server/include/screenint.h
index c95c0ef..c95c0ef 100644
--- a/Xincludes/xc/programs/Xserver/include/screenint.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/screenint.h
diff --git a/Xincludes/xc/programs/Xserver/include/scrnintstr.h b/Xincludes/usr/X11R6/lib/Server/include/scrnintstr.h
index 881b66d..881b66d 100644
--- a/Xincludes/xc/programs/Xserver/include/scrnintstr.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/scrnintstr.h
diff --git a/Xincludes/xc/programs/Xserver/include/validate.h b/Xincludes/usr/X11R6/lib/Server/include/validate.h
index 467533d..467533d 100644
--- a/Xincludes/xc/programs/Xserver/include/validate.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/validate.h
diff --git a/Xincludes/xc/programs/Xserver/include/window.h b/Xincludes/usr/X11R6/lib/Server/include/window.h
index c46714a..c46714a 100644
--- a/Xincludes/xc/programs/Xserver/include/window.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/window.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86.h b/Xincludes/usr/X11R6/lib/Server/include/xf86.h
index 19bccb9..19bccb9 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Module.h b/Xincludes/usr/X11R6/lib/Server/include/xf86Module.h
index f3d5f89..f3d5f89 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Module.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86Module.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Opt.h b/Xincludes/usr/X11R6/lib/Server/include/xf86Opt.h
index bd96b75..bd96b75 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Opt.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86Opt.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Version.h b/Xincludes/usr/X11R6/lib/Server/include/xf86Version.h
index 0922a99..0922a99 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Version.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86Version.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h b/Xincludes/usr/X11R6/lib/Server/include/xf86Xinput.h
index e497ca9..e497ca9 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86Xinput.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86Xinput.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h b/Xincludes/usr/X11R6/lib/Server/include/xf86_OSproc.h
index 796e527..796e527 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/os-support/xf86_OSproc.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86_OSproc.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h b/Xincludes/usr/X11R6/lib/Server/include/xf86_ansic.h
index a9166de..a9166de 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86_ansic.h
diff --git a/Xincludes/xc/programs/Xserver/include/xf86_libc.h b/Xincludes/usr/X11R6/lib/Server/include/xf86_libc.h
index f0e36d0..f0e36d0 100644
--- a/Xincludes/xc/programs/Xserver/include/xf86_libc.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86_libc.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86str.h b/Xincludes/usr/X11R6/lib/Server/include/xf86str.h
index 690c917..690c917 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xf86str.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xf86str.h
diff --git a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xisb.h b/Xincludes/usr/X11R6/lib/Server/include/xisb.h
index 39ae2ee..39ae2ee 100644
--- a/Xincludes/xc/programs/Xserver/hw/xfree86/common/xisb.h
+++ b/Xincludes/usr/X11R6/lib/Server/include/xisb.h
diff --git a/Xincludes/xc/programs/Xserver/include/xf86_ansic.h b/Xincludes/xc/programs/Xserver/include/xf86_ansic.h
deleted file mode 100644
index a9166de..0000000
--- a/Xincludes/xc/programs/Xserver/include/xf86_ansic.h
+++ /dev/null
@@ -1,342 +0,0 @@
-/*
- * Copyright 1997-2000 by The XFree86 Project, Inc
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the names of the above listed copyright holders
- * not be used in advertising or publicity pertaining to distribution of
- * the software without specific, written prior permission. The above listed
- * copyright holders make no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * THE ABOVE LISTED COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD
- * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY
- * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
- * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- */
-
-/* $XFree86: xc/programs/Xserver/hw/xfree86/os-support/xf86_ansic.h,v 3.47 2001/05/18 20:22:30 tsi Exp $ */
-
-#ifndef _XF86_ANSIC_H
-#define _XF86_ANSIC_H
-
-/* Handle <stdarg.h> */
-
-#ifndef IN_MODULE
-# include <stdarg.h>
-#else /* !IN_MODULE */
-# ifndef __OS2ELF__
-# include <stdarg.h>
-# else /* __OS2ELF__ */
- /* EMX/gcc_elf under OS/2 does not have native header files */
-# if !defined (_VA_LIST)
-# define _VA_LIST
- typedef char *va_list;
-# endif
-# define _VA_ROUND(t) ((sizeof (t) + 3) & -4)
-# if !defined (va_start)
-# define va_start(ap,v) ap = (va_list)&v + ((sizeof (v) + 3) & -4)
-# define va_end(ap) (ap = 0, (void)0)
-# define va_arg(ap,t) (ap += _VA_ROUND (t), *(t *)(ap - _VA_ROUND (t)))
-# endif
-# endif /* __OS2ELF__ */
-#endif /* IN_MODULE */
-
-/*
- * The first set of definitions are required both for modules and
- * libc_wrapper.c.
- */
-
-#if defined(XFree86LOADER) || defined(NEED_XF86_TYPES)
-
-#if !defined(SYSV) && !defined(SVR4) && !defined(Lynx) || defined(SCO)
-#define HAVE_VSSCANF
-#define HAVE_VFSCANF
-#endif
-
-#ifndef NULL
-#if (defined(SVR4) || defined(SYSV)) && !defined(__GNUC__)
-#define NULL 0
-#else
-#define NULL ((void *)0)
-#endif
-#endif
-#ifndef EOF
-#define EOF (-1)
-#endif
-
-#ifndef PATH_MAX
-#define PATH_MAX 1024
-#endif
-
-/* <limits.h> stuff */
-#define x_BITSPERBYTE 8
-#define x_BITS(type) (x_BITSPERBYTE * (int)sizeof(type))
-#define x_SHORTBITS x_BITS(short)
-#define x_INTBITS x_BITS(int)
-#define x_LONGBITS x_BITS(long)
-#ifndef SHRT_MIN
-#define SHRT_MIN ((short)(1 << (x_SHORTBITS - 1)))
-#endif
-
-#ifndef FONTMODULE
-#include "misc.h"
-#endif
-#include "xf86_libc.h"
-#ifndef SHRT_MAX
-#define SHRT_MAX ((short)~SHRT_MIN)
-#endif
-#ifndef USHRT_MAX
-#define USHRT_MAX ((unsigned short)~0)
-#endif
-#ifndef MINSHORT
-#define MINSHORT SHRT_MIN
-#endif
-#ifndef MAXSHORT
-#define MAXSHORT SHRT_MAX
-#endif
-#ifndef INT_MIN
-#define INT_MIN (1 << (x_INTBITS - 1))
-#endif
-#ifndef INT_MAX
-#define INT_MAX (~INT_MIN)
-#endif
-#ifndef UINT_MAX
-#define UINT_MAX (~0)
-#endif
-#ifndef MININT
-#define MININT INT_MIN
-#endif
-#ifndef MAXINT
-#define MAXINT INT_MAX
-#endif
-#ifndef LONG_MIN
-#define LONG_MIN ((long)(1 << (x_LONGBITS - 1)))
-#endif
-#ifndef LONG_MAX
-#define LONG_MAX ((long)~LONG_MIN)
-#endif
-#ifndef ULONG_MAX
-#define ULONG_MAX ((unsigned long)~0UL)
-#endif
-#ifndef MINLONG
-#define MINLONG LONG_MIN
-#endif
-#ifndef MAXLONG
-#define MAXLONG LONG_MAX
-#endif
-
-#endif /* XFree86LOADER || NEED_XF86_TYPES */
-
-#if defined(XFree86LOADER) || defined(NEED_XF86_PROTOTYPES)
-/*
- * ANSI C compilers only.
- */
-
-/* ANSI C emulation library */
-
-extern void xf86abort(void);
-extern int xf86abs(int);
-extern double xf86acos(double);
-extern double xf86asin(double);
-extern double xf86atan(double);
-extern double xf86atan2(double,double);
-extern double xf86atof(const char*);
-extern int xf86atoi(const char*);
-extern long xf86atol(const char*);
-extern void *xf86bsearch(const void *, const void *, xf86size_t, xf86size_t,
- int (*)(const void *, const void *));
-extern double xf86ceil(double);
-extern void* xf86calloc(xf86size_t,xf86size_t);
-extern void xf86clearerr(XF86FILE*);
-extern double xf86cos(double);
-extern void xf86exit(int);
-extern double xf86exp(double);
-extern double xf86fabs(double);
-extern int xf86fclose(XF86FILE*);
-extern int xf86feof(XF86FILE*);
-extern int xf86ferror(XF86FILE*);
-extern int xf86fflush(XF86FILE*);
-extern int xf86fgetc(XF86FILE*);
-extern int xf86getc(XF86FILE*);
-extern int xf86fgetpos(XF86FILE*,XF86fpos_t*);
-extern char* xf86fgets(char*,INT32,XF86FILE*);
-extern int xf86finite(double);
-extern double xf86floor(double);
-extern double xf86fmod(double,double);
-extern XF86FILE* xf86fopen(const char*,const char*);
-extern double xf86frexp(double, int*);
-extern int xf86printf(const char*,...);
-extern int xf86fprintf(XF86FILE*,const char*,...);
-extern int xf86fputc(int,XF86FILE*);
-extern int xf86fputs(const char*,XF86FILE*);
-extern xf86size_t xf86fread(void*,xf86size_t,xf86size_t,XF86FILE*);
-extern void xf86free(void*);
-extern XF86FILE* xf86freopen(const char*,const char*,XF86FILE*);
-#if defined(HAVE_VFSCANF) || !defined(NEED_XF86_PROTOTYPES)
-extern int xf86fscanf(XF86FILE*,const char*,...);
-#else
-extern int xf86fscanf(/*XF86FILE*,const char*,char *,char *,char *,char *,
- char *,char *,char *,char *,char *,char * */);
-#endif
-extern int xf86fseek(XF86FILE*,long,int);
-extern int xf86fsetpos(XF86FILE*,const XF86fpos_t*);
-extern long xf86ftell(XF86FILE*);
-extern xf86size_t xf86fwrite(const void*,xf86size_t,xf86size_t,XF86FILE*);
-extern char* xf86getenv(const char*);
-extern int xf86isalnum(int);
-extern int xf86isalpha(int);
-extern int xf86iscntrl(int);
-extern int xf86isdigit(int);
-extern int xf86isgraph(int);
-extern int xf86islower(int);
-extern int xf86isprint(int);
-extern int xf86ispunct(int);
-extern int xf86isspace(int);
-extern int xf86isupper(int);
-extern int xf86isxdigit(int);
-extern long xf86labs(long);
-extern double xf86ldexp(double,int);
-extern double xf86log(double);
-extern double xf86log10(double);
-extern void* xf86malloc(xf86size_t);
-extern void* xf86memchr(const void*,int,xf86size_t);
-extern int xf86memcmp(const void*,const void*,xf86size_t);
-extern void* xf86memcpy(void*,const void*,xf86size_t);
-extern void* xf86memmove(void*,const void*,xf86size_t);
-extern void* xf86memset(void*,int,xf86size_t);
-extern double xf86modf(double,double*);
-extern void xf86perror(const char*);
-extern double xf86pow(double,double);
-extern void xf86qsort(void*, xf86size_t, xf86size_t,
- int(*)(const void*, const void*));
-extern void* xf86realloc(void*,xf86size_t);
-extern int xf86remove(const char*);
-extern int xf86rename(const char*,const char*);
-extern void xf86rewind(XF86FILE*);
-extern int xf86setbuf(XF86FILE*,char*);
-extern int xf86setvbuf(XF86FILE*,char*,int,xf86size_t);
-extern double xf86sin(double);
-extern int xf86sprintf(char*,const char*,...);
-extern int xf86snprintf(char*,xf86size_t,const char*,...);
-extern double xf86sqrt(double);
-#if defined(HAVE_VSSCANF) || !defined(NEED_XF86_PROTOTYPES)
-extern int xf86sscanf(char*,const char*,...);
-#else
-extern int xf86sscanf(/*char*,const char*,char *,char *,char *,char *,
- char *,char *,char *,char *,char *,char * */);
-#endif
-extern char* xf86strcat(char*,const char*);
-extern char* xf86strchr(const char*, int c);
-extern int xf86strcmp(const char*,const char*);
-extern int xf86strcasecmp(const char*,const char*);
-extern char* xf86strcpy(char*,const char*);
-extern xf86size_t xf86strcspn(const char*,const char*);
-extern char* xf86strerror(int);
-extern xf86size_t xf86strlen(const char*);
-extern char* xf86strncat(char *, const char *, xf86size_t);
-extern int xf86strncmp(const char*,const char*,xf86size_t);
-extern int xf86strncasecmp(const char*,const char*,xf86size_t);
-extern char* xf86strncpy(char*,const char*,xf86size_t);
-extern char* xf86strpbrk(const char*,const char*);
-extern char* xf86strrchr(const char*,int);
-extern xf86size_t xf86strspn(const char*,const char*);
-extern char* xf86strstr(const char*,const char*);
-extern double xf86strtod(const char*,char**);
-extern char* xf86strtok(char*,const char*);
-extern long xf86strtol(const char*,char**,int);
-extern unsigned long xf86strtoul(const char*,char**,int);
-extern double xf86tan(double);
-extern XF86FILE* xf86tmpfile(void);
-extern char* xf86tmpnam(char*);
-extern int xf86tolower(int);
-extern int xf86toupper(int);
-extern int xf86ungetc(int,XF86FILE*);
-extern int xf86vfprintf(XF86FILE*,const char*,va_list);
-extern int xf86vsprintf(char*,const char*,va_list);
-extern int xf86vsnprintf(char*,xf86size_t,const char*,va_list);
-
-extern int xf86open(const char*, int,...);
-extern int xf86close(int);
-extern long xf86lseek(int, long, int);
-extern int xf86ioctl(int, unsigned long, pointer);
-extern xf86ssize_t xf86read(int, void *, xf86size_t);
-extern xf86ssize_t xf86write(int, const void *, xf86size_t);
-extern void* xf86mmap(void*, xf86size_t, int, int, int, xf86size_t /* off_t */);
-extern int xf86munmap(void*, xf86size_t);
-extern int xf86stat(const char *, struct xf86stat *);
-extern int xf86fstat(int, struct xf86stat *);
-extern int xf86access(const char *, int);
-extern int xf86errno;
-extern int xf86GetErrno(void);
-
-extern double xf86HUGE_VAL;
-
-extern double xf86hypot(double,double);
-
-/* non-ANSI C functions */
-extern XF86DIR* xf86opendir(const char*);
-extern int xf86closedir(XF86DIR*);
-extern XF86DIRENT* xf86readdir(XF86DIR*);
-extern void xf86rewinddir(XF86DIR*);
-extern void xf86bcopy(const void*,void*,xf86size_t);
-extern int xf86ffs(int);
-extern char* xf86strdup(const char*);
-extern void xf86bzero(void*,unsigned int);
-extern int xf86execl(const char *, const char *, ...);
-extern long xf86fpossize(void);
-extern int xf86chmod(const char *, xf86mode_t);
-extern int xf86chown(const char *, xf86uid_t, xf86gid_t);
-extern xf86uid_t xf86geteuid(void);
-extern xf86gid_t xf86getegid(void);
-extern int xf86getpid(void);
-extern int xf86mknod(const char *, xf86mode_t, xf86dev_t);
-extern int xf86mkdir(const char *, xf86mode_t);
-unsigned int xf86sleep(unsigned int seconds);
-/* sysv IPC */
-extern int xf86shmget(xf86key_t key, int size, int xf86shmflg);
-extern char * xf86shmat(int id, char *addr, int xf86shmflg);
-extern int xf86shmdt(char *addr);
-extern int xf86shmctl(int id, int xf86cmd, pointer buf);
-extern int xf86setjmp(xf86jmp_buf env);
-extern void xf86longjmp(xf86jmp_buf env, int val);
-
-#else /* XFree86LOADER || NEED_XF86_PROTOTYPES */
-#include <unistd.h>
-#include <stdio.h>
-#include <sys/ioctl.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <ctype.h>
-#ifdef HAVE_SYSV_IPC
-#include <sys/ipc.h>
-#include <sys/shm.h>
-#endif
-#include <sys/stat.h>
-#define stat_t struct stat
-#endif /* XFree86LOADER || NEED_XF86_PROTOTYPES */
-
-/*
- * These things are always required by drivers (but not by libc_wrapper.c),
- * even for a static server because some OSs don't provide them.
- */
-
-extern int xf86getpagesize(void);
-extern void xf86usleep(unsigned long);
-extern void xf86getsecs(long *, long *);
-#ifndef DONT_DEFINE_WRAPPERS
-#undef getpagesize
-#define getpagesize() xf86getpagesize()
-#undef usleep
-#define usleep(ul) xf86usleep(ul)
-#undef getsecs
-#define getsecs(a, b) xf86getsecs(a, b)
-#endif
-#endif /* _XF86_ANSIC_H */