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.36;	author wiz;	state dead;
branches;
next	1.2;

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

1.1
date	99.08.08.08.40.23;	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-ah,v 1.2 2000/02/05 15:58:29 wiz Exp $

Index: gram.y
===================================================================
RCS file: /home/siren/src/tvtwm/gram.y,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -r1.1.1.1 -r1.2
--- gram.y	1999/08/08 05:46:53	1.1.1.1
+++ gram.y	1999/08/08 05:56:49	1.2
@@@@ -80,6 +80,8 @@@@
 extern name_list **do_colorlist_keyword();
 extern int do_color_keyword(), do_string_savecolor();
 extern int yylineno;
+
+ int yylex(void);
 %}
 
 %union
@@@@ -207,7 +209,8 @@@@
 					    root = GetRoot(TWM_ROOT,NULLSTR,NULLSTR);
 					    Scr->Mouse[$1][C_ROOT][0].item = 
 						AddToMenu(root,"x",Action,
-							  NULLSTR,$2,NULLSTR,NULLSTR);
+							  (MenuRoot *) NULLSTR,
+							  $2,NULLSTR,NULLSTR);
 					  }
 					  Action = "";
 					  pull = NULL;
@@@@ -274,7 +277,8 @@@@
 					    root = GetRoot(TWM_ROOT,NULLSTR,NULLSTR);
 					    Scr->DefaultFunction.item = 
 						AddToMenu(root,"x",Action,
-							  NULLSTR,$2, NULLSTR, NULLSTR);
+							  (MenuRoot *) NULLSTR,
+							  $2, NULLSTR, NULLSTR);
 					  }
 					  Action = "";
 					  pull = NULL;
@@@@ -283,7 +287,8 @@@@
 					   root = GetRoot(TWM_ROOT,NULLSTR,NULLSTR);
 					   Scr->WindowFunction.item = 
 						AddToMenu(root,"x",Action,
-							  NULLSTR,$2, NULLSTR, NULLSTR);
+							  (MenuRoot *) NULLSTR,
+							  $2, NULLSTR, NULLSTR);
 					   Action = "";
 					   pull = NULL;
 					}
@@@@ -640,8 +645,9 @@@@
 		| function_entries function_entry
 		;
 
-function_entry	: action		{ AddToMenu(root, "", Action, NULLSTR, $1,
-						NULLSTR, NULLSTR);
+function_entry	: action		{ AddToMenu(root, "", Action,
+						    (MenuRoot *) NULLSTR, $1,
+						    NULLSTR, NULLSTR);
 					  Action = "";
 					}
 		;
@@@@ -829,6 +835,7 @@@@
 		;
 
 %%
+void
 yyerror(s) char *s;
 {
     twmrc_error_prefix();
@@@@ -836,12 +843,13 @@@@
     fprintf (stderr, ": %s", current_input_line());
     ParseError = 1;
 }
+void
 RemoveDQuote(str)
 char *str;
 {
     register char *i, *o;
-    register n;
-    register count;
+    register int n;
+    register int count;
 
     for (i=str+1, o=str; *i && *i != '\"'; o++)
     {
@@@@ -964,7 +972,7 @@@@
 	{
 	    root = GetRoot(TWM_ROOT, NULLSTR, NULLSTR);
 	    Scr->Mouse[butt][i][mods].item = AddToMenu(root,"x",Action,
-		    NULLSTR, func, NULLSTR, NULLSTR);
+		    (MenuRoot *) NULLSTR, func, NULLSTR, NULLSTR);
 	}
     }
     Action = "";
@@@@ -1053,7 +1061,7 @@@@
 }
 
 
-twmrc_error_prefix ()
+void twmrc_error_prefix ()
 {
     fprintf (stderr, "%s:  line %d:  ", ProgramName, yylineno);
 }
@


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
@