summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xold-configure13
-rw-r--r--video/out/vo_xv.c1
-rw-r--r--wscript2
3 files changed, 14 insertions, 2 deletions
diff --git a/old-configure b/old-configure
index f4baba7ee1..5a7f1880d7 100755
--- a/old-configure
+++ b/old-configure
@@ -1504,8 +1504,19 @@ echores "$_termios"
echocheck "shm"
if test "$_shm" = auto ; then
+ cat > $TMPC << EOF
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+int main(void) {
+ shmget(0, 0, 0);
+ shmat(0, 0, 0);
+ shmctl(0, 0, 0);
+ return 0;
+}
+EOF
_shm=no
- statement_check sys/shm.h 'shmget(0, 0, 0); shmat(0, 0, 0); shmctl(0, 0, 0)' && _shm=yes
+ cc_check && _shm=yes
fi
if test "$_shm" = yes ; then
def_shm='#define HAVE_SHM 1'
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index ff5cfdbcd3..43a98a7068 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -34,6 +34,7 @@
#include "config.h"
#if HAVE_SHM && HAVE_XEXT
+#include <sys/types.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#include <X11/extensions/XShm.h>
diff --git a/wscript b/wscript
index 7975b1e7e8..12577edd16 100644
--- a/wscript
+++ b/wscript
@@ -138,7 +138,7 @@ iconv support use --disable-iconv.",
}, {
'name': '--shm',
'desc': 'shm',
- 'func': check_statement('sys/shm.h',
+ 'func': check_statement(['sys/types.h', 'sys/ipc.h', 'sys/shm.h'],
'shmget(0, 0, 0); shmat(0, 0, 0); shmctl(0, 0, 0)')
}, {
'name': 'posix-select',