diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2005-04-20 12:25:28 +0000 |
|---|---|---|
| committer | Daniel Stone <daniel@fooishbar.org> | 2005-04-20 12:25:28 +0000 |
| commit | 5b044752c61f4b12173208ec788aa6e0e07e6f9a (patch) | |
| tree | 308f47866da70f2395a40da3a69a7684ab1b8d39 | |
| parent | 6c2581bf480c1fc189f0acc77ae6e6bcfbbfbf4e (diff) | |
Fix includes right throughout the Xserver tree:sco_port_update-baseXORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10
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/neo.h | 2 | ||||
| -rw-r--r-- | src/neo_driver.c | 8 | ||||
| -rw-r--r-- | src/neo_video.h | 4 |
3 files changed, 7 insertions, 7 deletions
@@ -62,7 +62,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xf86i2c.h" #include "xf86xv.h" -#include "Xv.h" +#include <X11/extensions/Xv.h> /* * Driver data structures. diff --git a/src/neo_driver.c b/src/neo_driver.c index 543f0c6..cb1f73c 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -96,7 +96,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "picturestr.h" #include "xf86xv.h" -#include "Xv.h" +#include <X11/extensions/Xv.h> /* * Driver data structures. @@ -106,13 +106,13 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "neo_macros.h" /* These need to be checked */ -#include "X.h" -#include "Xproto.h" +#include <X11/X.h> +#include <X11/Xproto.h> #include "scrnintstr.h" #include "servermd.h" #ifdef XFreeXDGA #define _XF86DGA_SERVER_ -#include "extensions/xf86dgastr.h" +#include <X11/extensions/xf86dgastr.h> #endif /* Mandatory functions */ diff --git a/src/neo_video.h b/src/neo_video.h index dfdaa47..708bd01 100644 --- a/src/neo_video.h +++ b/src/neo_video.h @@ -22,7 +22,7 @@ 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/drivers/neomagic/neo_video.h,v 1.2 2002/07/01 02:25:58 tsi Exp $ */ +/* $XFree86$ */ #ifndef _NEO_VIDEO_H #define _NEO_VIDEO_H @@ -31,7 +31,7 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "vgaHW.h" #include "fourcc.h" -#include "Xv.h" +#include <X11/extensions/Xv.h> #define NEO_VIDEO_VIDEO 0 #define NEO_VIDEO_IMAGE 1 |