aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-03-28 10:41:43 +0200
committermarha <marha@users.sourceforge.net>2012-03-28 10:41:43 +0200
commit13ab72df2e606427985cd6dcf7db694f4243936b (patch)
treefab866adca65f2d4c30e87d50bd9600a679e321f
parent20f3d5fe27c7c939479ee6c824bd3502e5f99c14 (diff)
downloadvcxsrv-13ab72df2e606427985cd6dcf7db694f4243936b.tar.gz
vcxsrv-13ab72df2e606427985cd6dcf7db694f4243936b.tar.bz2
vcxsrv-13ab72df2e606427985cd6dcf7db694f4243936b.zip
Solved compiler warnings and link errors on windows
-rw-r--r--xorg-server/os/log.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c
index f6410379c..56d693710 100644
--- a/xorg-server/os/log.c
+++ b/xorg-server/os/log.c
@@ -610,8 +610,12 @@ FatalError(const char *f, ...)
else
ErrorF("\nFatal server error:\n");
+#ifdef _MSC_VER
+ va_start(args, f);
+#else
/* Make a copy for OsVendorFatalError */
va_copy(args2, args);
+#endif
#ifdef __APPLE__
{
@@ -629,6 +633,9 @@ FatalError(const char *f, ...)
VErrorF(f, args);
va_end(args);
ErrorF("\n");
+#ifdef _MSC_VER
+ va_start(args2, f);
+#endif
if (!beenhere)
OsVendorFatalError(f, args2);
va_end(args2);