commit 4e3e79dc7d06310cf056354dd789f5da1e17693a
author Pierre Ossman <ossman@cendio.se> Fri Jan 30 16:09:08 2015 +0100
committer Pierre Ossman <ossman@cendio.se> Fri Jan 30 16:09:08 2015 +0100
tree f2b885520994cbdb83d3189db382932d06308fe3
parent 39b3b8f5752e3ffe140f78e054ba60aedf5d88ed

Make the calls to va_list logging functions more explicit

On some platforms va_list might be defined as something that causes
ambiguity and results in the wrong function being called.

common/rfb/LogWriter.h

diff --git a/common/rfb/LogWriter.h b/common/rfb/LogWriter.h
index 6b85a85..c3bb2b0 100644
--- a/common/rfb/LogWriter.h
+++ b/common/rfb/LogWriter.h
@@ -36,7 +36,7 @@
 // is assigned a particular log level.
 
 #define DEF_LOGFUNCTION(name, level) \
-  inline void name(const char* fmt, va_list ap) { \
+  inline void v##name(const char* fmt, va_list ap) { \
     if (m_log && (level <= m_level))       \
       m_log->write(level, m_name, fmt, ap);\
   } \

unix/xserver/hw/vnc/RFBGlue.cc

diff --git a/unix/xserver/hw/vnc/RFBGlue.cc b/unix/xserver/hw/vnc/RFBGlue.cc
index 7747d88..53d5bdb 100644
--- a/unix/xserver/hw/vnc/RFBGlue.cc
+++ b/unix/xserver/hw/vnc/RFBGlue.cc
@@ -46,7 +46,7 @@
   if (vlog == NULL)
     return;
   va_start(ap, format);
-  vlog->error(format, ap);
+  vlog->verror(format, ap);
   va_end(ap);
 }
 
@@ -58,7 +58,7 @@
   if (vlog == NULL)
     return;
   va_start(ap, format);
-  vlog->status(format, ap);
+  vlog->vstatus(format, ap);
   va_end(ap);
 }
 
@@ -70,7 +70,7 @@
   if (vlog == NULL)
     return;
   va_start(ap, format);
-  vlog->info(format, ap);
+  vlog->vinfo(format, ap);
   va_end(ap);
 }
 
@@ -82,7 +82,7 @@
   if (vlog == NULL)
     return;
   va_start(ap, format);
-  vlog->debug(format, ap);
+  vlog->vdebug(format, ap);
   va_end(ap);
 }