make some function declarations/prototypes consistent so that it

compiles with newer gcc

3 files changed, 188 insertions, 7 deletions

diff --git a/time/catclock/distinfo b/time/catclock/distinfo
index 685d1a85f17..bfdca39b3d5 100644
--- a/time/catclock/distinfo
+++ b/time/catclock/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 19:14:53 wiz Exp $
+$NetBSD: distinfo,v 1.8 2007/02/23 20:17:47 drochner Exp $
 
 SHA1 (catclock.zip) = 0e977f080968067c4232072aa88d919e3f5daf84
 RMD160 (catclock.zip) = 6caf81ec08f5c237902aaf9999e642300e4517c2
 Size (catclock.zip) = 180008 bytes
 SHA1 (patch-aa) = a42cdf9512e90501135ff66b598f580ddc449cdf
-SHA1 (patch-ab) = 86f72fbfcc352781cdc3ae760d3143c58e40cb6a
+SHA1 (patch-ab) = 7d19c6e72d19505f630ad6d7411ef0c1cc2b20e3
 SHA1 (patch-ac) = 3d115c8b0cf110f40f2322c5bc5cce37ad57089c
+SHA1 (patch-ad) = c2081fb4c6a375b5157dc2f91a29a57ec644ca4a
diff --git a/time/catclock/patches/patch-ab b/time/catclock/patches/patch-ab
index a39e8692fa4..29305531538 100644
--- a/time/catclock/patches/patch-ab
+++ b/time/catclock/patches/patch-ab
@@ -1,7 +1,50 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:16 wiz Exp $
---- xclock.c.orig	Sat Sep  4 19:09:20 1999
-+++ xclock.c	Sat Sep  4 19:09:40 1999
-@@ -351,7 +351,7 @@
+$NetBSD: patch-ab,v 1.2 2007/02/23 20:17:47 drochner Exp $
+
+--- xclock.c.orig	1995-05-22 13:47:42.000000000 +0200
++++ xclock.c
+@@ -264,10 +264,29 @@ static Boolean	showSecondHand = False;	 
+ 
+ static Boolean	iconified = False;	   /*  Clock iconified?		*/
+ 
+-
+-
+-
+-
++static void ParseGeometry(Widget, int, int, int);
++static int Round(double);
++static void DigitalString(char *);
++static void Syntax(char *);
++static void InitializeCat(Pixel, Pixel, Pixel);
++static GC CreateTailGC(void);
++static GC CreateEyeGC(void);
++static Pixmap CreateTailPixmap(double);
++static Pixmap CreateEyePixmap(double);
++static void EraseHands(Widget, struct tm *);
++static XtCallbackProc HandleExpose(Widget, XtPointer, XmDrawingAreaCallbackStruct *);
++static XtCallbackProc HandleInput(Widget, XtPointer, XmDrawingAreaCallbackStruct *);
++static XtCallbackProc HandleResize(Widget, XtPointer, XmDrawingAreaCallbackStruct *);
++static XtTimerCallbackProc Tick(Widget, int);
++static XtCallbackProc AlarmSetCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *);
++static XtCallbackProc AlarmBellCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *);
++static XtCallbackProc ChimeCallback(Widget, XtPointer, XmToggleButtonCallbackStruct *);
++static XtCallbackProc AckAlarmCallback(Widget, XtPointer, XmPushButtonCallbackStruct *);
++static XtCallbackProc RereadAlarmCallback(Widget, Widget, XmPushButtonCallbackStruct *);
++static XtCallbackProc EditAlarmCallback(Widget, Widget, XmPushButtonCallbackStruct *);
++static XtCallbackProc ExitCallback(Widget, XtPointer, XmPushButtonCallbackStruct *);
++static XtEventHandler MapCallback(Widget, XtPointer, XEvent *);
++static void SetSeg(int, int, int, int);
+ 
+ main(argc, argv)
+     int 	argc;
+@@ -281,7 +300,6 @@ main(argc, argv)
+     XGCValues	gcv;
+     u_long 	valueMask;
+     XmFontList	fontList = (XmFontList)NULL;
+-    extern void	ParseGeometry();
+ 
+     
+     static XtResource	resources[] = {
+@@ -351,7 +369,7 @@ main(argc, argv)
  
  	{ "mode", "Mode", XtRString, sizeof(char *),
  	    XtOffset(ApplicationDataPtr, modeString),
@@ -10,7 +53,15 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:16 wiz Exp $
  
  	{ "help", "Help", XtRBoolean, sizeof(Boolean),
  	    XtOffset(ApplicationDataPtr, help),
-@@ -403,7 +403,7 @@
+@@ -391,7 +409,6 @@ main(argc, argv)
+ 	{ "-help",        "*help",         XrmoptionNoArg,  (XtPointer)"on" },
+     };
+     
+-    extern XtEventHandler	MapCallback();
+     
+ 
+     /* 
+@@ -403,7 +420,7 @@ main(argc, argv)
      /*
       *  Open up the system
       */
@@ -19,3 +70,93 @@ $NetBSD: patch-ab,v 1.1.1.1 2000/12/17 23:32:16 wiz Exp $
  			       (XrmOptionDescList)(&options[0]),
  			       XtNumber(options),
  			       (unsigned int *)&argc, argv, NULL,
+@@ -418,7 +435,6 @@ main(argc, argv)
+      *  Print help message and exit if asked
+      */
+     if (appData.help) {
+-	extern void Syntax();
+ 
+ 	Syntax(argv[0]);
+     }
+@@ -568,7 +584,6 @@ main(argc, argv)
+ 	    time_t	timeValue;
+ 	    int		stringDir;
+ 	    XCharStruct	xCharStr;
+-	    extern void	DigitalString();
+ 
+ 	    /*
+ 	     *  Padding is around time text
+@@ -794,7 +809,6 @@ main(argc, argv)
+      *  Create cat pixmaps, etc. if in CAT_CLOCK mode
+      */
+     if (clockMode == CAT_CLOCK) {
+-	extern void InitializeCat();
+ 	
+ 	InitializeCat(appData.catColor,
+ 		      appData.detailColor,
+@@ -806,9 +820,6 @@ main(argc, argv)
+      *  Finally, install necessary callbacks
+      */
+     {
+-	extern XtCallbackProc 	HandleExpose(),
+-				HandleResize(),
+-				HandleInput();
+ 	
+ 	XtAddCallback(canvas, XmNexposeCallback, HandleExpose, NULL);
+ 	XtAddCallback(canvas, XmNresizeCallback, HandleResize, NULL);
+@@ -1191,7 +1202,6 @@ static void DrawLine(blankLength, length
+     double 	fractionOfACircle;
+ {
+     double 		angle, cosAngle, sinAngle;
+-    extern void		SetSeg();
+ 
+     /*
+      *  A full circle is 2 M_PI radians.
+@@ -1288,7 +1298,6 @@ static void DrawSecond(length, width, of
+     double 	ms, mc, ws, wc;
+     int 	mid;
+     int 	x, y;
+-    extern void		SetSeg();
+     
+     /*
+      *  A full circle is 2 PI radians.
+@@ -1477,8 +1486,6 @@ static void InitializeCat(catColor, deta
+     XGCValues 		gcv;
+     unsigned long 	valueMask;
+     GC			gc1, gc2;
+-    extern GC		CreateTailGC();
+-    extern GC		CreateEyeGC();
+ 
+ 
+     catPix = XCreatePixmap(dpy, root, winWidth, winHeight,
+@@ -1562,8 +1569,6 @@ static void InitializeCat(catColor, deta
+     eyePixmap  = (Pixmap *)malloc((appData.nTails + 1) * sizeof(Pixmap));
+ 
+     for (i = 0; i <= appData.nTails; i++) {
+-	static Pixmap CreateTailPixmap();
+-	static Pixmap CreateEyePixmap();
+ 
+ 	tailPixmap[i] = CreateTailPixmap(i * M_PI/(appData.nTails));
+ 	eyePixmap[i]  = CreateEyePixmap(i * M_PI/(appData.nTails));
+@@ -1934,7 +1939,6 @@ static XtCallbackProc HandleExpose(w, cl
+     XtPointer			clientData;
+     XmDrawingAreaCallbackStruct	*callData;
+ {
+-    extern XtTimerCallbackProc 	Tick();	
+ 
+     /*
+      *  Ignore if more expose events for this window in the queue
+@@ -2180,13 +2184,6 @@ static XtCallbackProc HandleInput(w, cli
+     			ackW, rereadW, editW, exitW;
+     static Widget	sepW1, sepW2;
+ 
+-    extern XtCallbackProc	AlarmSetCallback(),
+-				AlarmBellCallback(),
+-				ChimeCallback(),
+-				AckAlarmCallback(),
+-				RereadAlarmCallback(),
+-    				EditAlarmCallback(),
+-				ExitCallback();
+     
+     if (callData->event->type != ButtonPress) {
+ 	return;
diff --git a/time/catclock/patches/patch-ad b/time/catclock/patches/patch-ad
new file mode 100644
index 00000000000..b1f7f3afd08
--- /dev/null
+++ b/time/catclock/patches/patch-ad
@@ -0,0 +1,39 @@
+$NetBSD: patch-ad,v 1.1 2007/02/23 20:17:47 drochner Exp $
+
+--- alarm.c.orig	2007-02-23 18:00:04.000000000 +0100
++++ alarm.c
+@@ -92,7 +92,9 @@ extern GC 	gc;
+ 
+ static XmFontList xmFontList;
+ 
+-
++static void HideBell(void);
++static void TextScroll(void);
++static void Set_Alarm(void);
+ 
+ void InitBellAlarm(win, width, height, fontInfo, fontList, fg, bg, state, on)
+     Window 	win;
+@@ -159,7 +161,6 @@ void DrawBell(flash)
+ 		   bell_width, bell_height,
+ 		   bellX, bellY, 0x1);
+     } else {
+-	extern void HideBell();
+ 	
+ 	HideBell();
+     }
+@@ -181,7 +182,6 @@ static void AlarmAnnounce()
+     int 		i, w;
+     char 		buf[BUFSIZ];
+     struct itimerval 	tv;
+-    extern void		TextScroll();
+     
+     strcpy(buf, nextAlarm.alarmAnnounce ? nextAlarm.alarmAnnounce : "alarm");
+     strcat(buf, " ... ");
+@@ -442,7 +442,6 @@ void SetAlarm(file)
+ 
+ static void ResetAlarm()
+ {
+-    extern void Set_Alarm();
+     
+     if (!*alarmFile) {
+ 	return;