Latest CVS Compilation error

[Alexander Gottwald]

Colin Harrison wrote:

> To build I had to remove "typedef ....MessageType;" from winmsg.h in Xwin.

> Clashes with defs in os/log.c after latest mods to move log handling to DIX.

The patch is attached.

This patch is _only_ for the xfree86 HEAD. _Not_ for the 4_3_Branch.

It forwards the winMsg functions to the LogMessage functions which were
introduces short time ago.

bye
    ago

NP: Wumpscut - Embryodead
-- 
 Alexander.Gottwald@informatik.tu-chemnitz.de
 http://www.gotti.org           ICQ: 126018723
-------------- next part --------------
Index: winmsg.h
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xwin/winmsg.h,v
retrieving revision 1.1
diff -u -r1.1 winmsg.h
--- winmsg.h	17 Oct 2002 08:18:22 -0000	1.1
+++ winmsg.h	14 Sep 2003 18:47:49 -0000
@@ -32,31 +32,6 @@
 #ifndef __WIN_MSG_H__
 #define __WIN_MSG_H__
 
-
-#define __msg_name(name,string) name
-#define __msg(name,string) __msg_name(name,string)
-#define _msg(name,string) __msg(name,string),
-
-#define MESSAGE_STRINGS \
-    _msg(X_PROBED,"(--)"            /* Value was probed */)\
-    _msg(X_CONFIG,"(**)"            /* Value was given in the config file */)\
-    _msg(X_DEFAULT,"(==)"           /* Value is a default */)\
-    _msg(X_CMDLINE,"(++)"           /* Value was given on the command line */)\
-    _msg(X_NOTICE,"(!!)"            /* Notice */) \
-    _msg(X_ERROR,"(EE)"             /* Error message */) \
-    _msg(X_WARNING,"(WW)"           /* Warning message */) \
-    _msg(X_INFO,"(II)"              /* Informational message */) \
-    _msg(X_UNKNOWN,"(?""?)"         /* Unknown, trigraph fix */) \
-    _msg(X_NONE,NULL                /* No prefix */) \
-    __msg(X_NOT_IMPLEMENTED,"(NI)"  /* Not implemented */)
-
-typedef enum
-{
-  MESSAGE_STRINGS
-}
-MessageType;
-
-
 /*
  * Function prototypes
  */
Index: winmsg.c
===================================================================
RCS file: /cvs/xc/programs/Xserver/hw/xwin/winmsg.c,v
retrieving revision 1.1
diff -u -r1.1 winmsg.c
--- winmsg.c	17 Oct 2002 08:18:22 -0000	1.1
+++ winmsg.c	14 Sep 2003 18:47:49 -0000
@@ -45,26 +45,7 @@
 winVMsg (int scrnIndex, MessageType type, int verb, const char *format,
 	 va_list ap)
 {
-  const char *prefix = NULL;
-
-  if (verb && verb > VERBOSE_LEVEL)
-    return;
-
-#undef __msg
-#define __msg(name,string) case name: prefix = string; break;
-#undef _msg
-#define _msg(name,string) __msg(name,string)
-  switch (type)
-    {
-      MESSAGE_STRINGS default:prefix = NULL;
-      break;
-    }
-#undef __msg
-#undef _msg
-
-  if (prefix != NULL)
-    ErrorF ("%s ", prefix);
-  VErrorF (format, ap);
+  LogVMessageVerb(type, verb, format, ap);
 }
 
 
@@ -73,7 +54,7 @@
 {
   va_list ap;
   va_start (ap, format);
-  winVMsg (scrnIndex, type, 0, format, ap);
+  LogVMessageVerb(type, 0, format, ap);
   va_end (ap);
 }
 
@@ -83,7 +64,7 @@
 {
   va_list ap;
   va_start (ap, format);
-  winVMsg (0, type, 0, format, ap);
+  LogVMessageVerb(type, 0, format, ap);
   va_end (ap);
 }
 
@@ -94,7 +75,7 @@
 {
   va_list ap;
   va_start (ap, format);
-  winVMsg (scrnIndex, type, verb, format, ap);
+  LogVMessageVerb(type, verb, format, ap);
   va_end (ap);
 }
 
@@ -104,7 +85,7 @@
 {
   va_list ap;
   va_start (ap, format);
-  winVMsg (0, type, verb, format, ap);
+  LogVMessageVerb(type, verb, format, ap);
   va_end (ap);
 }
 
@@ -114,6 +95,6 @@
 {
   va_list ap;
   va_start (ap, format);
-  winVMsg (0, X_NONE, verb, format, ap);
+  LogVMessageVerb(X_NONE, verb, format, ap);
   va_end (ap);
 }