summaryrefslogtreecommitdiff
path: root/dix/main.c
diff options
context:
space:
mode:
authorDaniel Stone <daniel@fooishbar.org>2005-04-20 12:25:48 +0000
committerDaniel Stone <daniel@fooishbar.org>2005-04-20 12:25:48 +0000
commit292c4cff26687e6ef86c285b97813ab587daf009 (patch)
treeb12025c2277345526ba7abd97222be0670e28198 /dix/main.c
parentc062d7f96f47bdd31640be1fbce682d0774db3d9 (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.
Diffstat (limited to 'dix/main.c')
-rw-r--r--dix/main.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/dix/main.c b/dix/main.c
index 504602ead..481a199e2 100644
--- a/dix/main.c
+++ b/dix/main.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.5 2005/03/07 23:02:58 gisburn Exp $ */
+/* $XdotOrg: xc/programs/Xserver/dix/main.c,v 1.6 2005/03/23 19:58:45 gisburn Exp $ */
/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.43 2003/10/30 21:21:02 herrb Exp $ */
/***********************************************************
@@ -80,9 +80,9 @@ Equipment Corporation.
/* $TOG: main.c /main/86 1998/02/09 14:20:03 kaleb $ */
#define NEED_EVENTS
-#include "X.h"
-#include "Xos.h" /* for unistd.h */
-#include "Xproto.h"
+#include <X11/X.h>
+#include <X11/Xos.h> /* for unistd.h */
+#include <X11/Xproto.h>
#include "scrnintstr.h"
#include "misc.h"
#include "os.h"
@@ -110,7 +110,7 @@ Equipment Corporation.
#ifdef DPMSExtension
#define DPMS_SERVER
-#include "dpms.h"
+#include <X11/extensions/dpms.h>
#include "dpmsproc.h"
#endif