head	1.2;
access;
symbols
	pkgsrc-2013Q2:1.2.0.54
	pkgsrc-2013Q2-base:1.2
	pkgsrc-2012Q4:1.2.0.52
	pkgsrc-2012Q4-base:1.2
	pkgsrc-2011Q4:1.2.0.50
	pkgsrc-2011Q4-base:1.2
	pkgsrc-2011Q2:1.2.0.48
	pkgsrc-2011Q2-base:1.2
	pkgsrc-2009Q4:1.2.0.46
	pkgsrc-2009Q4-base:1.2
	pkgsrc-2008Q4:1.2.0.44
	pkgsrc-2008Q4-base:1.2
	pkgsrc-2008Q3:1.2.0.42
	pkgsrc-2008Q3-base:1.2
	cube-native-xorg:1.2.0.40
	cube-native-xorg-base:1.2
	pkgsrc-2008Q2:1.2.0.38
	pkgsrc-2008Q2-base:1.2
	pkgsrc-2008Q1:1.2.0.36
	pkgsrc-2008Q1-base:1.2
	pkgsrc-2007Q4:1.2.0.34
	pkgsrc-2007Q4-base:1.2
	pkgsrc-2007Q3:1.2.0.32
	pkgsrc-2007Q3-base:1.2
	pkgsrc-2007Q2:1.2.0.30
	pkgsrc-2007Q2-base:1.2
	pkgsrc-2007Q1:1.2.0.28
	pkgsrc-2007Q1-base:1.2
	pkgsrc-2006Q4:1.2.0.26
	pkgsrc-2006Q4-base:1.2
	pkgsrc-2006Q3:1.2.0.24
	pkgsrc-2006Q3-base:1.2
	pkgsrc-2006Q2:1.2.0.22
	pkgsrc-2006Q2-base:1.2
	pkgsrc-2006Q1:1.2.0.20
	pkgsrc-2006Q1-base:1.2
	pkgsrc-2005Q4:1.2.0.18
	pkgsrc-2005Q4-base:1.2
	pkgsrc-2005Q3:1.2.0.16
	pkgsrc-2005Q3-base:1.2
	pkgsrc-2005Q2:1.2.0.14
	pkgsrc-2005Q2-base:1.2
	pkgsrc-2005Q1:1.2.0.12
	pkgsrc-2005Q1-base:1.2
	pkgsrc-2004Q4:1.2.0.10
	pkgsrc-2004Q4-base:1.2
	pkgsrc-2004Q3:1.2.0.8
	pkgsrc-2004Q3-base:1.2
	pkgsrc-2004Q2:1.2.0.6
	pkgsrc-2004Q2-base:1.2
	pkgsrc-2004Q1:1.2.0.4
	pkgsrc-2004Q1-base:1.2
	pkgsrc-2003Q4:1.2.0.2
	pkgsrc-2003Q4-base:1.2
	buildlink2-base:1.2
	comdex-fall-1999:1.1
	netbsd-1-4-PATCH001:1.1
	netbsd-1-4-RELEASE:1.1;
locks; strict;
comment	@# @;


1.2
date	99.11.10.08.01.29;	author soren;	state dead;
branches;
next	1.1;

1.1
date	99.04.03.21.45.17;	author mycroft;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Changed patches.
@
text
@$NetBSD: patch-al,v 1.1 1999/04/03 21:45:17 mycroft Exp $

--- src/unix/video-drivers/x11_window.c.orig	Tue Mar 23 18:33:50 1999
+++ src/unix/video-drivers/x11_window.c	Sat Apr  3 16:24:55 1999
@@@@ -311,11 +311,6 @@@@
             image->data = shm_info.shmaddr =
                (char *) shmat (shm_info.shmid, 0, 0);
 
-            /* Mark segment as deletable after we attach.  When all processes
-               detach from the segment (progam exits), it will be deleted. 
-               This way it won't be left in memory if we crash or something. */
-            shmctl(shm_info.shmid, IPC_RMID, NULL);
-
             scaled_buffer_ptr = (unsigned char *) image->data;
             if (!scaled_buffer_ptr)
             {
@@@@ -330,6 +325,7 @@@@
             if (!XShmAttach (display, &shm_info))
             {
                fprintf (stderr_file, "\nError: failed to attach MITSHM block.\n");
+               shmctl(shm_info.shmid, IPC_RMID, NULL);
                return OSD_NOT_OK;
             }
             XSync (display, False);  /* be sure to get request processed */
@@@@ -340,6 +336,12 @@@@
                start_timer ();
 #endif
             XSetErrorHandler (None);  /* Restore error handler to default */
+
+            /* Mark segment as deletable after we attach.  When all processes
+               detach from the segment (progam exits), it will be deleted. 
+               This way it won't be left in memory if we crash or something. */
+            shmctl(shm_info.shmid, IPC_RMID, NULL);
+
             /* if use_mit_shm is still set we've succeeded */
             if (use_mit_shm)
             {
@


1.1
log
@0.35b8.1
@
text
@d1 1
a1 1
$NetBSD$
@