diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-10 11:33:12 +0200 |
| commit | d79e641dea89c0d5d651b11971c4c9e14df34629 (patch) | |
| tree | 59d636ef9c4c21906ea28ac719589f25b9794d0a /xorg-server/os | |
| parent | bf59764a4685c4bef029eddfa75d7496d2a91ae0 (diff) | |
| parent | c6f80401dc533b04341afe8d596960d1bc25efce (diff) | |
| download | vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.gz vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.tar.bz2 vcxsrv-d79e641dea89c0d5d651b11971c4c9e14df34629.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/log.c
Diffstat (limited to 'xorg-server/os')
| -rw-r--r-- | xorg-server/os/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/os/log.c b/xorg-server/os/log.c index 56d693710..390223519 100644 --- a/xorg-server/os/log.c +++ b/xorg-server/os/log.c @@ -610,9 +610,9 @@ FatalError(const char *f, ...) else ErrorF("\nFatal server error:\n"); -#ifdef _MSC_VER va_start(args, f); -#else + +#ifndef _MSC_VER /* Make a copy for OsVendorFatalError */ va_copy(args2, args); #endif |