XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

7 files changed, 14 insertions, 22 deletions

diff --git a/hw/xfree86/dummylib/dummylib.h b/hw/xfree86/dummylib/dummylib.h
index 4b685e272..d8a0d285a 100644
--- a/hw/xfree86/dummylib/dummylib.h
+++ b/hw/xfree86/dummylib/dummylib.h
@@ -1,8 +1,6 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.1 2000/02/13 03:06:38 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/dummylib.h,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
 
 #ifndef _DUMMY_LIB_H
 #define _DUMMY_LIB_H
 
-extern void VErrorFVerb(int verb, const char *format, va_list ap);
-
 #endif /* _DUMMY_LIB_H */
diff --git a/hw/xfree86/dummylib/xf86drvmsg.c b/hw/xfree86/dummylib/xf86drvmsg.c
index ffcefd6bf..5780d9c13 100644
--- a/hw/xfree86/dummylib/xf86drvmsg.c
+++ b/hw/xfree86/dummylib/xf86drvmsg.c
@@ -1,10 +1,9 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "dummylib.h"
 
 /*
  * Utility functions required by libxf86_os. 
@@ -16,7 +15,7 @@ xf86DrvMsg(int i, MessageType type, const char *format, ...)
     va_list ap;
 
     va_start(ap, format);
-    VErrorFVerb(1, format, ap);
+    LogVWrite(1, format, ap);
     va_end(ap);
 }
 
diff --git a/hw/xfree86/dummylib/xf86drvmsgverb.c b/hw/xfree86/dummylib/xf86drvmsgverb.c
index f59c42abf..b7c0ddb53 100644
--- a/hw/xfree86/dummylib/xf86drvmsgverb.c
+++ b/hw/xfree86/dummylib/xf86drvmsgverb.c
@@ -1,10 +1,9 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.1 2000/02/13 03:06:40 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86drvmsgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "dummylib.h"
 
 /*
  * Utility functions required by libxf86_os. 
@@ -16,7 +15,7 @@ xf86DrvMsgVerb(int i, MessageType type, int verb, const char *format, ...)
     va_list ap;
 
     va_start(ap, format);
-    VErrorFVerb(verb, format, ap);
+    LogVWrite(verb, format, ap);
     va_end(ap);
 }
 
diff --git a/hw/xfree86/dummylib/xf86errorf.c b/hw/xfree86/dummylib/xf86errorf.c
index 072f639ca..122f46d43 100644
--- a/hw/xfree86/dummylib/xf86errorf.c
+++ b/hw/xfree86/dummylib/xf86errorf.c
@@ -1,10 +1,9 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.2 2000/05/31 07:15:05 eich Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorf.c,v 1.3 2003/09/09 03:20:38 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "dummylib.h"
 
 /*
  * Utility functions required by libxf86_os. 
@@ -16,7 +15,7 @@ xf86ErrorF(const char *format, ...)
     va_list ap;
 
     va_start(ap, format);
-    VErrorFVerb(1, format, ap);
+    LogVWrite(1, format, ap);
     va_end(ap);
 }
 
@@ -26,6 +25,6 @@ ErrorF(const char *format, ...)
     va_list ap;
 
     va_start(ap, format);
-    VErrorFVerb(1, format, ap);
+    LogVWrite(1, format, ap);
     va_end(ap);
 }
diff --git a/hw/xfree86/dummylib/xf86errorfverb.c b/hw/xfree86/dummylib/xf86errorfverb.c
index 61bff15a5..61c3e02a2 100644
--- a/hw/xfree86/dummylib/xf86errorfverb.c
+++ b/hw/xfree86/dummylib/xf86errorfverb.c
@@ -1,10 +1,9 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.1 2000/02/13 03:06:41 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86errorfverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "dummylib.h"
 
 /*
  * Utility functions required by libxf86_os. 
@@ -16,7 +15,7 @@ xf86ErrorFVerb(int verb, const char *format, ...)
     va_list ap;
 
     va_start(ap, format);
-    VErrorFVerb(verb, format, ap);
+    LogVWrite(verb, format, ap);
     va_end(ap);
 }
 
diff --git a/hw/xfree86/dummylib/xf86msg.c b/hw/xfree86/dummylib/xf86msg.c
index bc8c76626..2d36bea97 100644
--- a/hw/xfree86/dummylib/xf86msg.c
+++ b/hw/xfree86/dummylib/xf86msg.c
@@ -1,10 +1,9 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msg.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "dummylib.h"
 
 /*
  * Utility functions required by libxf86_os. 
@@ -16,7 +15,7 @@ xf86Msg(MessageType type, const char *format, ...)
     va_list ap;
 
     va_start(ap, format);
-    VErrorFVerb(1, format, ap);
+    LogVWrite(1, format, ap);
     va_end(ap);
 }
 
diff --git a/hw/xfree86/dummylib/xf86msgverb.c b/hw/xfree86/dummylib/xf86msgverb.c
index b9e343fd9..f460b6b9f 100644
--- a/hw/xfree86/dummylib/xf86msgverb.c
+++ b/hw/xfree86/dummylib/xf86msgverb.c
@@ -1,10 +1,9 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.1 2000/02/13 03:06:42 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/dummylib/xf86msgverb.c,v 1.2 2003/09/09 03:20:38 dawes Exp $ */
 
 #include "X.h"
 #include "os.h"
 #include "xf86.h"
 #include "xf86Priv.h"
-#include "dummylib.h"
 
 /*
  * Utility functions required by libxf86_os. 
@@ -16,7 +15,7 @@ xf86MsgVerb(MessageType type, int verb, const char *format, ...)
     va_list ap;
 
     va_start(ap, format);
-    VErrorFVerb(verb, format, ap);
+    LogVWrite(verb, format, ap);
     va_end(ap);
 }