summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-04-20 12:25:29 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-04-20 12:25:29 +0000
commit2db214d7cf5336fbea36d83bc9b089f70a494614 (patch)
treecaa68521febad8b72c8a47da861e34e0b437c1b8
parent3fe983d254f1ffe3c285548013be677ed4a67137 (diff)
Fix includes right throughout the Xserver tree:
change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h; change "foo.h", "extensions/foo.h" and "X11/foo.h" to <X11/extensions/foo.h> for extension headers, e.g. Xv.h; change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
-rw-r--r--src/nv_include.h4
-rw-r--r--src/nv_video.c2
-rw-r--r--src/riva_include.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/nv_include.h b/src/nv_include.h
index 2d4465b..bcdb481 100644
--- a/src/nv_include.h
+++ b/src/nv_include.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.11 2001/12/07 00:09:56 mvojkovi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_include.h,v 1.9 2000/10/06 12:31:03 eich Exp $ */
#ifndef __NV_INCLUDE_H__
#define __NV_INCLUDE_H__
@@ -43,7 +43,7 @@
#include "fbdevhw.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "vgaHW.h"
diff --git a/src/nv_video.c b/src/nv_video.c
index 7bfa94b..04b8489 100644
--- a/src/nv_video.c
+++ b/src/nv_video.c
@@ -11,7 +11,7 @@
#include "regionstr.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "xaa.h"
#include "xaalocal.h"
#include "dixstruct.h"
diff --git a/src/riva_include.h b/src/riva_include.h
index d5994d2..9e15010 100644
--- a/src/riva_include.h
+++ b/src/riva_include.h
@@ -43,7 +43,7 @@
#include "fbdevhw.h"
#include "xf86xv.h"
-#include "Xv.h"
+#include <X11/extensions/Xv.h>
#include "vgaHW.h"