[Mplayer-cvslog] CVS: main/libvo vo_x11.c,1.40,1.41

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main/libvo
In directory mplayer:/var/tmp.root/cvs-serv29737

Modified Files:
	vo_x11.c 
Log Message:
changed SH_MEM to HAVE_SHM according to configure

Index: vo_x11.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_x11.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- vo_x11.c	18 Nov 2001 14:09:56 -0000	1.40
+++ vo_x11.c	19 Nov 2001 15:51:17 -0000	1.41
@@ -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,