head	1.3;
access;
symbols
	pkgsrc-2013Q2:1.3.0.54
	pkgsrc-2013Q2-base:1.3
	pkgsrc-2012Q4:1.3.0.52
	pkgsrc-2012Q4-base:1.3
	pkgsrc-2011Q4:1.3.0.50
	pkgsrc-2011Q4-base:1.3
	pkgsrc-2011Q2:1.3.0.48
	pkgsrc-2011Q2-base:1.3
	pkgsrc-2009Q4:1.3.0.46
	pkgsrc-2009Q4-base:1.3
	pkgsrc-2008Q4:1.3.0.44
	pkgsrc-2008Q4-base:1.3
	pkgsrc-2008Q3:1.3.0.42
	pkgsrc-2008Q3-base:1.3
	cube-native-xorg:1.3.0.40
	cube-native-xorg-base:1.3
	pkgsrc-2008Q2:1.3.0.38
	pkgsrc-2008Q2-base:1.3
	pkgsrc-2008Q1:1.3.0.36
	pkgsrc-2008Q1-base:1.3
	pkgsrc-2007Q4:1.3.0.34
	pkgsrc-2007Q4-base:1.3
	pkgsrc-2007Q3:1.3.0.32
	pkgsrc-2007Q3-base:1.3
	pkgsrc-2007Q2:1.3.0.30
	pkgsrc-2007Q2-base:1.3
	pkgsrc-2007Q1:1.3.0.28
	pkgsrc-2007Q1-base:1.3
	pkgsrc-2006Q4:1.3.0.26
	pkgsrc-2006Q4-base:1.3
	pkgsrc-2006Q3:1.3.0.24
	pkgsrc-2006Q3-base:1.3
	pkgsrc-2006Q2:1.3.0.22
	pkgsrc-2006Q2-base:1.3
	pkgsrc-2006Q1:1.3.0.20
	pkgsrc-2006Q1-base:1.3
	pkgsrc-2005Q4:1.3.0.18
	pkgsrc-2005Q4-base:1.3
	pkgsrc-2005Q3:1.3.0.16
	pkgsrc-2005Q3-base:1.3
	pkgsrc-2005Q2:1.3.0.14
	pkgsrc-2005Q2-base:1.3
	pkgsrc-2005Q1:1.3.0.12
	pkgsrc-2005Q1-base:1.3
	pkgsrc-2004Q4:1.3.0.10
	pkgsrc-2004Q4-base:1.3
	pkgsrc-2004Q3:1.3.0.8
	pkgsrc-2004Q3-base:1.3
	pkgsrc-2004Q2:1.3.0.6
	pkgsrc-2004Q2-base:1.3
	pkgsrc-2004Q1:1.3.0.4
	pkgsrc-2004Q1-base:1.3
	pkgsrc-2003Q4:1.3.0.2
	pkgsrc-2003Q4-base:1.3
	buildlink2-base:1.3
	netbsd-1-5-RELEASE:1.2
	netbsd-1-4-PATCH003:1.2
	netbsd-1-4-PATCH002:1.2
	comdex-fall-1999:1.1;
locks; strict;
comment	@# @;


1.3
date	2000.12.12.02.11.39;	author wiz;	state dead;
branches;
next	1.2;

1.2
date	2000.02.05.15.58.30;	author wiz;	state Exp;
branches;
next	1.1;

1.1
date	99.08.08.08.40.24;	author blymn;	state Exp;
branches;
next	;


desc
@@


1.3
log
@Added wm category to main Makefile; remove packages that have been moved
from x11 to wm; fix paths in packages that depend on the moved ones.
@
text
@$NetBSD: patch-aw,v 1.2 2000/02/05 15:58:30 wiz Exp $

Index: twm.c
===================================================================
RCS file: /home/siren/src/tvtwm/twm.c,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- twm.c	1999/08/08 05:46:53	1.1.1.1
+++ twm.c	1999/08/08 05:56:58	1.2
@@@@ -142,6 +142,7 @@@@
 #include <signal.h>
 #include <fcntl.h>
 #include <sys/wait.h>
+#include <unistd.h>
 #include "twm.h"
 #include "add_window.h"
 #include "gc.h"
@@@@ -153,9 +154,12 @@@@
 #include "gram.h"
 #include "screen.h"
 #include "iconmgr.h"
+#include "list.h"
+#include "icons.h"
 #include <X11/Xproto.h>
 #include <X11/Xatom.h>
 #include <X11/bitmaps/root_weave>
+#include <X11/Xmu/Error.h>
 #include "vdt.h"
 #define XK_LATIN1
 #include <X11/keysymdef.h>
@@@@ -230,6 +234,10 @@@@
 
 extern void assign_var_savecolor();
 
+void InternUsefulAtoms (void);
+void InitVariables(void);
+void CreateFonts (void);
+
 /***********************************************************************
  *
  *  Procedure:
@@@@ -238,7 +246,7 @@@@
  ***********************************************************************
  */
 
-main(argc, argv, environ)
+int main(argc, argv, environ)
     int argc;
     char **argv;
     char **environ;
@@@@ -727,6 +735,8 @@@@
     }
 
     HandleEvents();
+    exit(0);
+      /* NOTREACHED */
 }
 
 /***********************************************************************
@@@@ -827,7 +837,7 @@@@
  ***********************************************************************
  */
 
-InitVariables()
+void InitVariables(void)
 {
     FreeList(&Scr->BorderColorL);
     FreeList(&Scr->IconBorderColorL);
@@@@ -1020,7 +1030,7 @@@@
 }
 
 
-RestoreWithdrawnLocation (tmp)
+void RestoreWithdrawnLocation (tmp)
     TwmWindow *tmp;
 {
     int gravx, gravy;
@@@@ -1227,7 +1237,7 @@@@
 Atom _XA_TWM_PROCESS;   /* used to record where twm is */
 Atom _XA_TWM_MACHINE;
 
-InternUsefulAtoms ()
+void InternUsefulAtoms (void)
 {
     /* 
      * Create priority colors if necessary.
@


1.2
log
@RCS tags added
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@This set of patches does the following:
	1) makes m4 work so preprocessing of tvtwm menu files is possible
	2) general code clean up.  Code now compiles almost without
	   warnings with -Wall on.
	3) bug fixes spotted when doing (2) - things like fucntions not
	   returning values when they should and assignments in if
	   statements that were not meant to be.
@
text
@d1 2
@