merge XFree86 4.3.0.1 to -CURRENT

2003-11-17 19:03:47 +00:00
parent 9508a382f8
commit c57959ad6a
615 changed files with 42990 additions and 101132 deletions
--- a/dix/initatoms.c
+++ b/dix/initatoms.c
@@ -5,8 +5,9 @@

 #include "X.h"
 #include "Xatom.h"
-extern Atom MakeAtom();
-MakePredeclaredAtoms()
+#include "misc.h"
+#include "dix.h"
+void MakePredeclaredAtoms()
 {
    if (MakeAtom("PRIMARY", 7, 1) != XA_PRIMARY) AtomError();
    if (MakeAtom("SECONDARY", 9, 1) != XA_SECONDARY) AtomError();