[Mplayer-cvslog] CVS: main/linux shmem.c,1.5,1.6

Alex Beregszaszi alex at mplayer.dev.hu
Mon Dec 3 15:37:28 CET 2001


Update of /cvsroot/mplayer/main/linux
In directory mplayer:/var/tmp.root/cvs-serv9109

Modified Files:
	shmem.c 
Log Message:
undef HAVE_SHM compilation bug fixed

Index: shmem.c
===================================================================
RCS file: /cvsroot/mplayer/main/linux/shmem.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- shmem.c	23 Nov 2001 16:08:44 -0000	1.5
+++ shmem.c	3 Dec 2001 14:37:26 -0000	1.6
@@ -59,8 +59,8 @@
     if(p==MAP_FAILED) break; // failed
     mp_dbg(MSGT_OSDEP, MSGL_DBG2, "shmem: %d bytes allocated using mmap /dev/zero (%p)\n",size,p);
     return p;
-#ifdef HAVE_SHM
   case 2: { // ========= shmget() ==========
+#ifdef HAVE_SHM
     struct shmid_ds shmemds;
     int shmemid;
     if ((shmemid = shmget(IPC_PRIVATE, size, IPC_CREAT | 0600)) == -1) break;
@@ -80,7 +80,7 @@
     mp_msg(MSGT_OSDEP, MSGL_FATAL, "shmem: no SHM support was compiled in!\n");
     return(NULL);
 #endif
-	}
+    }
   default:
     mp_msg(MSGT_OSDEP, MSGL_FATAL,
 	"FATAL: Cannot allocate %d bytes of shared memory :(\n",size);




More information about the MPlayer-cvslog mailing list