diff options
author | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:33:57 +0100 |
commit | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (patch) | |
tree | 91ed73daada51bddd5652fd847f30b3593ecff04 /xorg-server/os/osinit.c | |
parent | 6d8fefe38077f4d532c256e79cfcaf2a46c5269d (diff) | |
parent | 8fbb807d1029b012d2f45cb0f3ea0c6a6ebded6d (diff) | |
download | vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.gz vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.tar.bz2 vcxsrv-cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver pixman git update 9 nov 2013
Conflicts:
mesalib/src/mesa/drivers/dri/common/dri_util.c
xorg-server/Xext/shm.c
Diffstat (limited to 'xorg-server/os/osinit.c')
-rw-r--r-- | xorg-server/os/osinit.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/os/osinit.c b/xorg-server/os/osinit.c index 6c66f9c12..60d10694b 100644 --- a/xorg-server/os/osinit.c +++ b/xorg-server/os/osinit.c @@ -149,6 +149,8 @@ OsSigHandler(int signo) } #endif /* !WIN32 || __CYGWIN__ */ +#include "busfault.h" + void OsInit(void) { @@ -185,6 +187,9 @@ OsInit(void) } } #endif /* !WIN32 || __CYGWIN__ */ +#ifdef BUSFAULT + busfault_init(); +#endif #ifdef HAVE_BACKTRACE /* |