diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-28 09:11:07 +0200 |
| commit | 9b51c6da8bffdd67353b1e1245698a7eac478481 (patch) | |
| tree | cde44c263cb1756fae5b4a83facb3c0cdfa474e4 /xorg-server/hw/dmx | |
| parent | fb2b04331b6ae2cd11f6132cf16f6fcd848fb6b8 (diff) | |
| parent | ec617f09d07e32d6f57c0da133f53ad3d43a568a (diff) | |
| download | vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.gz vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.tar.bz2 vcxsrv-9b51c6da8bffdd67353b1e1245698a7eac478481.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'xorg-server/hw/dmx')
| -rw-r--r-- | xorg-server/hw/dmx/dmxinit.c | 2 | ||||
| -rw-r--r-- | xorg-server/hw/dmx/dmxlog.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c index 23a1385c6..5e3f1103c 100644 --- a/xorg-server/hw/dmx/dmxinit.c +++ b/xorg-server/hw/dmx/dmxinit.c @@ -906,7 +906,7 @@ OsVendorInit(void) * two routines mentioned here, as well as by others) to use the * referenced routine instead of \a vfprintf().) */ void -OsVendorFatalError(void) +OsVendorFatalError(const char *f, va_list args) { } diff --git a/xorg-server/hw/dmx/dmxlog.c b/xorg-server/hw/dmx/dmxlog.c index b56bb93ed..33aee590a 100644 --- a/xorg-server/hw/dmx/dmxlog.c +++ b/xorg-server/hw/dmx/dmxlog.c @@ -110,9 +110,6 @@ VFatalError(const char *format, va_list args) { VErrorF(format, args); ErrorF("\n"); -#ifdef DDXOSFATALERROR - OsVendorFatalError(); -#endif AbortServer(); /*NOTREACHED*/} #endif |