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/WaitFor.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/WaitFor.c')
| -rw-r--r-- | xorg-server/os/WaitFor.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/xorg-server/os/WaitFor.c b/xorg-server/os/WaitFor.c index fc02b572f..ffa740fe4 100644 --- a/xorg-server/os/WaitFor.c +++ b/xorg-server/os/WaitFor.c @@ -72,6 +72,7 @@ SOFTWARE. #ifdef DPMSExtension #include "dpmsproc.h" #endif +#include "busfault.h" #ifdef WIN32 /* Error codes from windows sockets differ from fileio error codes */ @@ -162,6 +163,10 @@ WaitForSomething(int *pClientsReady) SmartScheduleStopTimer(); nready = 0; +#ifdef BUSFAULT + busfault_check(); +#endif + /* We need a while loop here to handle crashed connections and the screen saver timeout */ while (1) { |