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/test | |
| 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/test')
| -rw-r--r-- | xorg-server/test/Makefile.am | 3 | ||||
| -rw-r--r-- | xorg-server/test/ddxstubs.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/xorg-server/test/Makefile.am b/xorg-server/test/Makefile.am index b875b75f7..eb6147021 100644 --- a/xorg-server/test/Makefile.am +++ b/xorg-server/test/Makefile.am @@ -52,6 +52,9 @@ libxservertest_la_LIBADD += \ $(top_builddir)/hw/xfree86/i2c/libi2c.la \ $(top_builddir)/hw/xfree86/dixmods/libxorgxkb.la \ @XORG_LIBS@ + +EXTRA_DIST = ddxstubs.c + else nodist_libxservertest_la_SOURCES = \ ddxstubs.c \ diff --git a/xorg-server/test/ddxstubs.c b/xorg-server/test/ddxstubs.c index a214b9637..3647dc556 100644 --- a/xorg-server/test/ddxstubs.c +++ b/xorg-server/test/ddxstubs.c @@ -50,7 +50,7 @@ OsVendorInit(void) } void -OsVendorFatalError(void) +OsVendorFatalError(const char *f, va_list args) { } |