diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-14 08:34:43 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-14 08:34:43 +0100 |
| commit | 9837797b353b2e24e7ac96d3a74159497410c21a (patch) | |
| tree | 3d4b6d9eb5e91d8b838610c1a04d738ad7f8ced4 /xorg-server/Xext/shm.c | |
| parent | cb9ef04f0bb4cc87787a113f61fcfa7c4818b29b (diff) | |
| parent | 4c9f1ba041644329543e4ca21c0d95cf872f988e (diff) | |
| download | vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.gz vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.tar.bz2 vcxsrv-9837797b353b2e24e7ac96d3a74159497410c21a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa xserver git update 14 nov 2013
Diffstat (limited to 'xorg-server/Xext/shm.c')
| -rw-r--r-- | xorg-server/Xext/shm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/Xext/shm.c b/xorg-server/Xext/shm.c index c9d39b22e..227fe8c4f 100644 --- a/xorg-server/Xext/shm.c +++ b/xorg-server/Xext/shm.c @@ -57,6 +57,7 @@ in this Software without prior written authorization from The Open Group. #include <X11/Xfuncproto.h> #include <sys/mman.h> #include "protocol-versions.h" +#include "busfault.h" /* Needed for Solaris cross-zone shared memory extension */ #ifdef HAVE_SHMCTL64 |