Mercurial > mplayer.hg

changeset 3003:16a593a1e6ed

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changed SH_MEM to HAVE_SHM according to configure
author alex
date Mon, 19 Nov 2001 15:51:17 +0000
parents 660026738a8f
children cb81a27b00c6
files libvo/vo_x11.c
diffstat 1 files changed, 5 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_x11.c	Mon Nov 19 14:55:36 2001 +0000
+++ b/libvo/vo_x11.c	Mon Nov 19 15:51:17 2001 +0000
@@ -76,9 +76,7 @@
 
 static int Flip_Flag;
 
-#define SH_MEM
-
-#ifdef SH_MEM
+#ifdef HAVE_SHM
 
 #include <sys/ipc.h>
 #include <sys/shm.h>
@@ -314,7 +312,7 @@
 #endif
    }
 
-#ifdef SH_MEM
+#ifdef HAVE_SHM
  if ( mLocalDisplay && XShmQueryExtension( mDisplay ) ) Shmem_Flag=1;
   else
    {
@@ -385,7 +383,7 @@
    myximage=XGetImage( mDisplay,mywindow,0,0,
    image_width,image_height,AllPlanes,ZPixmap );
    ImageData=myximage->data;
-#ifdef SH_MEM
+#ifdef HAVE_SHM
   }
 
   DeInstallXErrorHandler();
@@ -437,7 +435,7 @@
 static void Terminate_Display_Process( void )
 {
  getchar();      /* wait for enter to remove window */
-#ifdef SH_MEM
+#ifdef HAVE_SHM
  if ( Shmem_Flag )
   {
    XShmDetach( mDisplay,&Shminfo[0] );
@@ -453,7 +451,7 @@
 static void Display_Image( XImage *myximage,uint8_t *ImageData )
 {
 #ifdef DISP
-#ifdef SH_MEM
+#ifdef HAVE_SHM
  if ( Shmem_Flag )
   {
    XShmPutImage( mDisplay,mywindow,mygc,myximage,