diff options
| author | ldelgass <ldelgass> | 2003-03-30 04:49:52 +0000 |
|---|---|---|
| committer | ldelgass <ldelgass> | 2003-03-30 04:49:52 +0000 |
| commit | b8c3a04c9a0316029234e9f6d23bd41fc3d6b21f (patch) | |
| tree | 04302240ba49af242bd168881e18855a8a1b863a /xc/programs/Xserver/dix/main.c | |
| parent | ebce8f934a8bb868f6d390ec3b35a3dc2ae18c0b (diff) | |
Merge trunk - 4.3.0, filpmach64-0-0-6-20030330
Diffstat (limited to 'xc/programs/Xserver/dix/main.c')
| -rw-r--r-- | xc/programs/Xserver/dix/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xc/programs/Xserver/dix/main.c b/xc/programs/Xserver/dix/main.c index 41d3d661b..a31f33d8a 100644 --- a/xc/programs/Xserver/dix/main.c +++ b/xc/programs/Xserver/dix/main.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.39 2002/02/19 11:09:22 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/dix/main.c,v 3.40 2003/02/17 16:55:31 dawes Exp $ */ /*********************************************************** Copyright 1987, 1998 The Open Group @@ -91,10 +91,10 @@ SOFTWARE. #include "servermd.h" #include "site.h" #include "dixfont.h" +#include "extnsionst.h" #ifdef PANORAMIX #include "panoramiXsrv.h" #else -#include "extnsionst.h" #include "dixevents.h" /* InitEvents() */ #include "dispatch.h" /* InitProcVectors() */ #endif |