Attachment #94419 for bug #132571

View | Details | Raw Unified | Return to bug 132571
Collapse All | Expand All

Lines 7-13 Link Here

(-)x11-wm/fvwm/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= fvwm	8	PORTNAME= fvwm
9	PORTVERSION= 1.24r	9	PORTVERSION= 1.24r
10	PORTREVISION= 3	10	PORTREVISION= 4
11	CATEGORIES= x11-wm	11	CATEGORIES= x11-wm
12	MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-1/ \	12	MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-1/ \
13	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/	13	ftp://ftp.ics.es.osaka-u.ac.jp/pub/CFAN/sources/1.x/

Added Link Here

(-)x11-wm/fvwm/files/patch-fvwm__events.c (+11 lines)
1	--- ./fvwm/events.c.orig 1994-11-15 14:02:39.000000000 +0000
2	+++ ./fvwm/events.c 2009-03-11 09:42:52.000000000 +0000
3	@@ -985,7 +985,7 @@
4	(MouseEntry->Modifier == (modifier& (~LockMask)))))
5	{
6	/* got a match, now process it */
7	- if (MouseEntry->func != (int)NULL)
8	+ if (MouseEntry->func != 0)
9	{
10	Action = MouseEntry->item ? MouseEntry->item->action : NULL;
11	ExecuteFunction(MouseEntry->func, Action, Event.xany.window,

Added Link Here

(-)x11-wm/fvwm/files/patch-fvwm__fvwm.c (+28 lines)
1	--- ./fvwm/fvwm.c.orig 1994-11-15 14:02:52.000000000 +0000
2	+++ ./fvwm/fvwm.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -132,7 +132,7 @@
4	*
5	***********************************************************************
6	*/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	unsigned long valuemask; /* mask for create windows */
11	XSetWindowAttributes attributes; /* attributes for create windows */
12	@@ -463,7 +463,7 @@
13	}
14
15	HandleEvents();
16	- return;
17	+ return (0);
18	}
19
20	/***********************************************************************
21	@@ -988,6 +988,7 @@
22	#endif
23
24	fprintf(stderr,USAGE,VERSION);
25	+ exit (0);
26
27	}
28

Added Link Here

(-)x11-wm/fvwm/files/patch-fvwm__icons.c (+11 lines)
1	--- ./fvwm/icons.c.orig 1994-11-15 14:03:29.000000000 +0000
2	+++ ./fvwm/icons.c 2009-03-11 09:42:52.000000000 +0000
3	@@ -340,7 +340,7 @@
4	if(Tmp_win->flags & SUPPRESSICON)
5	return;
6
7	- if (Tmp_win->icon_w == (int)NULL)
8	+ if (Tmp_win->icon_w == 0)
9	return;
10
11	Tmp_win->icon_t_width = XTextWidth(IconFont->font,Tmp_win->icon_name,

Added Link Here

(-)x11-wm/fvwm/files/patch-libs__SendInfo.c (+9 lines)
1	--- ./libs/SendInfo.c.orig 1994-09-13 18:53:14.000000000 +0000
2	+++ ./libs/SendInfo.c 2009-03-11 09:42:49.000000000 +0000
3	@@ -1,5 +1,6 @@
4	#include <stdio.h>
5	#include <ctype.h>
6	+#include <string.h>
7
8	/***********************************************************************
9	*

Added Link Here

(-)x11-wm/fvwm/files/patch-libs__SendText.c (+10 lines)
1	--- ./libs/SendText.c.orig 1994-09-13 18:53:12.000000000 +0000
2	+++ ./libs/SendText.c 2009-03-11 09:42:49.000000000 +0000
3	@@ -1,5 +1,7 @@
4	#include <stdio.h>
5	#include <ctype.h>
6	+#include <string.h>
7	+
8	/************************************************************************
9	*
10	* Sends arbitrary text to fvwm

Added Link Here

(-)x11-wm/fvwm/files/patch-libs__fvwmlib.h (+11 lines)
1	--- ./libs/fvwmlib.h.orig 1994-09-16 14:47:13.000000000 +0000
2	+++ ./libs/fvwmlib.h 2009-03-11 09:42:44.000000000 +0000
3	@@ -4,7 +4,7 @@
4	int mygethostname(char *client, int namelen);
5	void SendText(int fd,char message,unsigned long window);
6	void SendInfo(int fd,char message,unsigned long window);
7	-char *safemalloc(int);
8	+void *safemalloc(unsigned int);
9	char findIconFile(char icon, char *pathlist, int type);
10	int ReadFvwmPacket(int fd, unsigned long header, unsigned long *body);
11	void CopyString(char *dest, char source);

Added Link Here

(-)x11-wm/fvwm/files/patch-libs__hostname.c (+10 lines)
1	--- ./libs/hostname.c.orig 1994-09-22 12:37:18.000000000 +0000
2	+++ ./libs/hostname.c 2009-03-11 09:42:49.000000000 +0000
3	@@ -4,6 +4,7 @@
4	/* define mygethostname() by using uname() */
5
6	#include <sys/utsname.h>
7	+#include <string.h>
8
9	int mygethostname(char *client, int length)
10	{

Added Link Here

(-)x11-wm/fvwm/files/patch-libs__mystrcasecmp.c (+10 lines)
1	--- ./libs/mystrcasecmp.c.orig 1994-09-14 15:55:20.000000000 +0000
2	+++ ./libs/mystrcasecmp.c 2009-03-11 09:42:49.000000000 +0000
3	@@ -1,6 +1,7 @@
4	#include <stdio.h>
5	#include <stdlib.h>
6	#include <ctype.h>
7	+#include <string.h>
8
9	int mystrcasecmp(char s1,char s2)
10	{

Added Link Here

(-)x11-wm/fvwm/files/patch-libs__safemalloc.c (+21 lines)
1	--- ./libs/safemalloc.c.orig 1994-09-13 19:38:01.000000000 +0000
2	+++ ./libs/safemalloc.c 2009-03-11 09:42:44.000000000 +0000
3	@@ -8,15 +8,15 @@
4	* problem
5	*
6	***********************************************************************/
7	-char *safemalloc(int length)
8	+void *safemalloc(unsigned int length)
9	{
10	- char *ptr;
11	+ void *ptr;
12
13	if(length <= 0)
14	length = 1;
15
16	ptr = malloc(length);
17	- if(ptr == (char *)0)
18	+ if(ptr == NULL)
19	{
20	fprintf(stderr,"malloc of %d bytes failed. Exiting\n",length);
21	exit(1);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmAudio__FvwmAudio.c (+11 lines)
1	--- ./modules/FvwmAudio/FvwmAudio.c.orig 1994-09-14 14:28:53.000000000 +0000
2	+++ ./modules/FvwmAudio/FvwmAudio.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -477,7 +477,7 @@
4
5	if (sound_table[sound])
6	{
7	- memset(buf,NULL,BUFSIZE);
8	+ memset(buf, 0, sizeof(buf));
9
10	/*
11	* Don't use audio_play_dir if it's NULL or if the sound file

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmAuto__FvwmAuto.c (+19 lines)
1	--- ./modules/FvwmAuto/FvwmAuto.c.orig 1994-12-02 19:04:02.000000000 +0000
2	+++ ./modules/FvwmAuto/FvwmAuto.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -57,7 +57,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	FILE *file;
11	char mask_mesg[80];
12	@@ -82,6 +82,7 @@
13	sprintf(mask_mesg,"SET_MASK %lu\n",(unsigned long)(M_FOCUS_CHANGE));
14	SendInfo(fd,mask_mesg,0);
15	Loop(fd);
16	+ return (0);
17	}
18
19

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmBacker__FvwmBacker.c (+19 lines)
1	--- ./modules/FvwmBacker/FvwmBacker.c.orig 1994-09-28 13:37:39.000000000 +0000
2	+++ ./modules/FvwmBacker/FvwmBacker.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -84,7 +84,7 @@
4	/* #define LOGFILE "/tmp/FvwmBacker.log"*/
5
6
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11	char* displayName = NULL;
12	@@ -139,6 +139,7 @@
13
14	/* Recieve all messages from Fvwm */
15	EndLessLoop();
16	+ return (0);
17	}
18
19	/******************************************************************************

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmBacker__Mallocs.c (+11 lines)
1	--- ./modules/FvwmBacker/Mallocs.c.orig 1994-09-14 20:06:16.000000000 +0000
2	+++ ./modules/FvwmBacker/Mallocs.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -33,6 +33,8 @@
4	#include "../../fvwm/alpha_header.h"
5	#endif /* NEEDS_ALPHA_HEADER */
6
7	+#include "Mallocs.h"
8	+
9	extern char *Module;
10
11	/******************************************************************************




--- ./modules/FvwmBacker/Mallocs.h.orig	1994-09-14 19:59:18.000000000 +0000
+++ ./modules/FvwmBacker/Mallocs.h	2009-03-11 09:42:48.000000000 +0000
@@ -18,8 +18,9 @@
  * own risk. Permission to use this program for any purpose is given,
  * as long as the copyright is kept intact. */
 
+#include "../../libs/fvwmlib.h"
+
 /* Function Prototypes */
-char *safemalloc(int length);
 char *saferealloc(char *ptr, int length);
 void sleep_a_little(int n);
 void UpdateString(char **string,char *value);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmBacker__root_bits.c (+10 lines)
1	--- ./modules/FvwmBacker/root_bits.c.orig 1994-09-16 12:36:23.000000000 +0000
2	+++ ./modules/FvwmBacker/root_bits.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -38,6 +38,7 @@
4	#include <X11/Xutil.h>
5	#include <X11/Xatom.h>
6	#include <stdio.h>
7	+#include <stdlib.h>
8	#include "X11/bitmaps/gray"
9
10	char *index();

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmClean__FvwmClean.c (+51 lines)
1	--- ./modules/FvwmClean/FvwmClean.c.orig 1994-09-16 15:53:49.000000000 +0000
2	+++ ./modules/FvwmClean/FvwmClean.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -52,7 +52,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11	FILE *file;
12	@@ -134,6 +134,7 @@
13	SendInfo(fd,"Send_WindowList",0);
14
15	Loop(fd);
16	+ return (0);
17	}
18
19
20	@@ -228,31 +229,6 @@
21	}
22
23
24	-
25	-
26	-/***********************************************************************
27	- *
28	- * Procedure:
29	- * safemalloc - mallocs specified space or exits if there's a
30	- * problem
31	- *
32	- ***********************************************************************/
33	-char *safemalloc(int length)
34	-{
35	- char *ptr;
36	-
37	- if(length <=0)
38	- length = 1;
39	-
40	- ptr = malloc(length);
41	- if(ptr == (char *)0)
42	- {
43	- fprintf(stderr,"%s:malloc failed",MyName);
44	- exit(1);
45	- }
46	- return ptr;
47	-}
48	-
49	/***********************************************************************
50	*
51	* Procedure:

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmClean__FvwmClean.h (+10 lines)
1	--- ./modules/FvwmClean/FvwmClean.h.orig 1994-09-13 18:24:26.000000000 +0000
2	+++ ./modules/FvwmClean/FvwmClean.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -18,7 +18,6 @@
4	*************************************************************************/
5	void Loop(int *fd);
6	void SendInfo(int fd,char message,unsigned long window);
7	-char *safemalloc(int length);
8	struct list *find_window(unsigned long id);
9	void remove_window(unsigned long id);
10	void add_window(unsigned long new_win);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmDebug__FvwmDebug.c (+19 lines)
1	--- ./modules/FvwmDebug/FvwmDebug.c.orig 1994-09-30 12:48:59.000000000 +0000
2	+++ ./modules/FvwmDebug/FvwmDebug.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -36,7 +36,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11
12	@@ -75,6 +75,7 @@
13	SendInfo(fd,"Send_WindowList",0);
14
15	Loop(fd);
16	+ return (0);
17	}
18
19	/***********************************************************************

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmDebug__FvwmDebug.h (+10 lines)
1	--- ./modules/FvwmDebug/FvwmDebug.h.orig 1994-09-13 18:24:41.000000000 +0000
2	+++ ./modules/FvwmDebug/FvwmDebug.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -6,7 +6,6 @@
4	*************************************************************************/
5	void Loop(int *fd);
6	void SendInfo(int fd,char message,unsigned long window);
7	-char *safemalloc(int length);
8	void DeadPipe(int nonsense);
9	void process_message(unsigned long type,unsigned long *body);
10

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmIconBox__FvwmIconBox.c (+19 lines)
1	--- ./modules/FvwmIconBox/FvwmIconBox.c.orig 1994-09-16 15:54:49.000000000 +0000
2	+++ ./modules/FvwmIconBox/FvwmIconBox.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -155,7 +155,7 @@
4	Based on main() from GoodStuff:
5	Copyright 1993, Robert Nation.
6	************************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char *display_name = NULL;
11	char temp, s;
12	@@ -223,6 +223,7 @@
13	SendFvwmPipe(fd,"Send_WindowList",0);
14
15	Loop();
16	+ return (0);
17	}
18
19	/************************************************************************

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmIconBox__FvwmIconBox.h (+10 lines)
1	--- ./modules/FvwmIconBox/FvwmIconBox.h.orig 1994-09-13 20:38:23.000000000 +0000
2	+++ ./modules/FvwmIconBox/FvwmIconBox.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -15,7 +15,6 @@
4	extern void match_string(char *tline);
5	extern void Loop(void);
6	extern void ParseOptions(char *);
7	-extern char *safemalloc(int length);
8	extern void change_window_name(char *str);
9	extern int My_XNextEvent(Display dpy, XEvent event);
10	extern void CopyString(char *dest, char source);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmIdent__FvwmIdent.c (+19 lines)
1	--- ./modules/FvwmIdent/FvwmIdent.c.orig 1994-09-16 15:07:11.000000000 +0000
2	+++ ./modules/FvwmIdent/FvwmIdent.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -80,7 +80,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11	FILE *file;
12	@@ -173,6 +173,7 @@
13	SendInfo(fd,"Send_WindowList",0);
14
15	Loop(fd);
16	+ return (0);
17	}
18
19	/**************************************************************************

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmIdent__FvwmIdent.h (+10 lines)
1	--- ./modules/FvwmIdent/FvwmIdent.h.orig 1994-09-13 18:25:16.000000000 +0000
2	+++ ./modules/FvwmIdent/FvwmIdent.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -42,7 +42,6 @@
4	*************************************************************************/
5	void Loop(int *fd);
6	void SendInfo(int fd,char message,unsigned long window);
7	-char *safemalloc(int length);
8	void DeadPipe(int nonsense);
9	void process_message(unsigned long type,unsigned long *body);
10	void GetTargetWindow(Window *app_win);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmPager__FvwmPager.c (+19 lines)
1	--- ./modules/FvwmPager/FvwmPager.c.orig 1994-10-07 12:49:26.000000000 +0000
2	+++ ./modules/FvwmPager/FvwmPager.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -82,7 +82,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s, *cptr;
11	char *display_name = NULL;
12	@@ -186,6 +186,7 @@
13	SendInfo(fd,"Send_WindowList",0);
14
15	Loop(fd);
16	+ return (0);
17	}
18
19	/***********************************************************************




--- ./modules/FvwmPager/FvwmPager.h.orig	1994-10-07 12:49:27.000000000 +0000
+++ ./modules/FvwmPager/FvwmPager.h	2009-03-11 09:42:48.000000000 +0000
@@ -1,3 +1,5 @@
+#include "../../libs/fvwmlib.h"
+
 typedef struct ScreenInfo
 {
   unsigned long screen;
@@ -83,7 +85,6 @@
  *************************************************************************/
 void Loop(int *fd);
 void SendInfo(int *fd,char *message,unsigned long window);
-char *safemalloc(int length);
 void DeadPipe(int nonsense);
 void process_message(unsigned long type,unsigned long *body);
 void ParseOptions(char *filename);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmSaveDesk__FvwmSaveDesk.c (+19 lines)
1	--- ./modules/FvwmSaveDesk/FvwmSaveDesk.c.orig 1994-09-16 15:07:59.000000000 +0000
2	+++ ./modules/FvwmSaveDesk/FvwmSaveDesk.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -64,7 +64,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11	char *display_name = NULL;
12	@@ -112,6 +112,7 @@
13	SendInfo(fd,"Send_WindowList",0);
14
15	Loop(fd);
16	+ return (0);
17	}
18
19

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmSaveDesk__FvwmSaveDesk.h (+10 lines)
1	--- ./modules/FvwmSaveDesk/FvwmSaveDesk.h.orig 1994-09-13 18:25:45.000000000 +0000
2	+++ ./modules/FvwmSaveDesk/FvwmSaveDesk.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -27,7 +27,6 @@
4	*************************************************************************/
5	void Loop(int *fd);
6	void SendInfo(int fd,char message,unsigned long window);
7	-char *safemalloc(int length);
8	struct list *find_window(unsigned long id);
9	void add_window(unsigned long new_win, unsigned long *body);
10	void DeadPipe(int nonsense);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmSave__FvwmSave.c (+19 lines)
1	--- ./modules/FvwmSave/FvwmSave.c.orig 1994-09-16 15:07:40.000000000 +0000
2	+++ ./modules/FvwmSave/FvwmSave.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -51,7 +51,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11	char *display_name = NULL;
12	@@ -99,6 +99,7 @@
13	SendInfo(fd,"Send_WindowList",0);
14
15	Loop(fd);
16	+ return (0);
17	}
18
19

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmSave__FvwmSave.h (+10 lines)
1	--- ./modules/FvwmSave/FvwmSave.h.orig 1994-09-13 18:25:36.000000000 +0000
2	+++ ./modules/FvwmSave/FvwmSave.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -26,7 +26,6 @@
4	*************************************************************************/
5	void Loop(int *fd);
6	void SendInfo(int fd,char message,unsigned long window);
7	-char *safemalloc(int length);
8	struct list *find_window(unsigned long id);
9	void add_window(unsigned long new_win, unsigned long *body);
10	void DeadPipe(int nonsense);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmScroll__FvwmScroll.c (+26 lines)
1	--- ./modules/FvwmScroll/FvwmScroll.c.orig 1994-09-16 15:08:10.000000000 +0000
2	+++ ./modules/FvwmScroll/FvwmScroll.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -65,7 +65,7 @@
4	* main - start of module
5	*
6	***********************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11	FILE *file;
12	@@ -159,12 +159,13 @@
13	GetTargetWindow(&app_win);
14
15	if(app_win == 0)
16	- return;
17	+ return (0);
18
19	fd_width = GetFdWidth();
20
21	GrabWindow(app_win);
22	Loop(app_win);
23	+ return (0);
24	}
25
26

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmScroll__FvwmScroll.h (+8 lines)
1	--- ./modules/FvwmScroll/FvwmScroll.h.orig 1994-09-14 14:11:35.000000000 +0000
2	+++ ./modules/FvwmScroll/FvwmScroll.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -1,5 +1,4 @@
4	#include "../../libs/fvwmlib.h"
5	-char *safemalloc(int length);
6	void DeadPipe(int nonsense);
7	void GetTargetWindow(Window *app_win);
8	void sleep_a_little(int n);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmWinList__ButtonArray.c (+10 lines)
1	--- ./modules/FvwmWinList/ButtonArray.c.orig 1994-05-09 17:08:28.000000000 +0000
2	+++ ./modules/FvwmWinList/ButtonArray.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -14,6 +14,7 @@
4
5	#include <stdlib.h>
6	#include <stdio.h>
7	+#include <string.h>
8	#include <X11/Xlib.h>
9	#include "ButtonArray.h"
10	#include "Mallocs.h"

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmWinList__FvwmWinList.c (+19 lines)
1	--- ./modules/FvwmWinList/FvwmWinList.c.orig 1994-09-19 12:40:13.000000000 +0000
2	+++ ./modules/FvwmWinList/FvwmWinList.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -101,7 +101,7 @@
4	Based on main() from FvwmIdent:
5	Copyright 1994, Robert Nation and Nobutaka Suzuki.
6	******************************************************************************/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char temp, s;
11
12	@@ -153,6 +153,7 @@
13
14	/* Recieve all messages from Fvwm */
15	EndLessLoop();
16	+ return (0);
17	}
18
19	/******************************************************************************

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmWinList__Mallocs.c (+11 lines)
1	--- ./modules/FvwmWinList/Mallocs.c.orig 1994-09-14 20:07:21.000000000 +0000
2	+++ ./modules/FvwmWinList/Mallocs.c 2009-03-11 09:42:43.000000000 +0000
3	@@ -33,6 +33,8 @@
4	#include "../../fvwm/alpha_header.h"
5	#endif /* NEEDS_ALPHA_HEADER */
6
7	+#include "Mallocs.h"
8	+
9	extern char *Module;
10
11	/******************************************************************************




--- ./modules/FvwmWinList/Mallocs.h.orig	1994-09-14 14:11:34.000000000 +0000
+++ ./modules/FvwmWinList/Mallocs.h	2009-03-11 09:42:48.000000000 +0000
@@ -18,8 +18,9 @@
  * own risk. Permission to use this program for any purpose is given,
  * as long as the copyright is kept intact. */
 
+#include "../../libs/fvwmlib.h"
+
 /* Function Prototypes */
-char *safemalloc(int length);
 char *saferealloc(char *ptr, int length);
 void sleep_a_little(int n);
 void CopyString(char **dest, char *source);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__GoodStuff__GoodStuff.c (+28 lines)
1	--- ./modules/GoodStuff/GoodStuff.c.orig 1994-12-05 17:39:04.000000000 +0000
2	+++ ./modules/GoodStuff/GoodStuff.c 2009-03-11 09:42:52.000000000 +0000
3	@@ -89,7 +89,7 @@
4	*
5	***********************************************************************
6	*/
7	-void main(int argc, char **argv)
8	+int main(int argc, char **argv)
9	{
10	char *display_name = NULL;
11	int i,j;
12	@@ -209,7 +209,7 @@
13	SendText(fd,"Send_WindowList",0);
14
15	Loop();
16	-
17	+ return (0);
18	}
19
20	/***********************************************************************
21	@@ -396,7 +396,6 @@
22	}
23	}
24	}
25	- return;
26	}
27
28	/************************************************************************

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__GoodStuff__GoodStuff.h (+10 lines)
1	--- ./modules/GoodStuff/GoodStuff.h.orig 1994-09-14 19:58:12.000000000 +0000
2	+++ ./modules/GoodStuff/GoodStuff.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -13,7 +13,6 @@
4	extern void match_string(char *tline);
5	extern void Loop(void);
6	extern void ParseOptions(char *);
7	-extern char *safemalloc(int length);
8	extern void change_window_name(char *str);
9	extern int My_XNextEvent(Display dpy, XEvent event);
10	extern FVWM_INLINE void RelieveWindow(Window win,int x,int y,int w,int h,GC rGC,GC sGC);

Added Link Here

(-)x11-wm/fvwm/files/patch-xpmroot__xpmroot.c (+10 lines)
1	--- ./xpmroot/xpmroot.c.orig 1994-11-15 14:06:38.000000000 +0000
2	+++ ./xpmroot/xpmroot.c 2009-03-11 09:42:51.000000000 +0000
3	@@ -11,6 +11,7 @@
4	#include <stdio.h>
5	#include <signal.h>
6	#include <string.h>
7	+#include <stdlib.h>
8	#include <X11/Xos.h>
9	#include <X11/Xatom.h>
10	#include <X11/xpm.h>

Return to bug 132571

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmBacker__Mallocs.h (+13 lines)
1	--- ./modules/FvwmBacker/Mallocs.h.orig 1994-09-14 19:59:18.000000000 +0000
2	+++ ./modules/FvwmBacker/Mallocs.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -18,8 +18,9 @@
4	* own risk. Permission to use this program for any purpose is given,
5	* as long as the copyright is kept intact. */
6
7	+#include "../../libs/fvwmlib.h"
8	+
9	/* Function Prototypes */
10	-char *safemalloc(int length);
11	char saferealloc(char ptr, int length);
12	void sleep_a_little(int n);
13	void UpdateString(char *string,char value);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmPager__FvwmPager.h (+16 lines)
1	--- ./modules/FvwmPager/FvwmPager.h.orig 1994-10-07 12:49:27.000000000 +0000
2	+++ ./modules/FvwmPager/FvwmPager.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -1,3 +1,5 @@
4	+#include "../../libs/fvwmlib.h"
5	+
6	typedef struct ScreenInfo
7	{
8	unsigned long screen;
9	@@ -83,7 +85,6 @@
10	*************************************************************************/
11	void Loop(int *fd);
12	void SendInfo(int fd,char message,unsigned long window);
13	-char *safemalloc(int length);
14	void DeadPipe(int nonsense);
15	void process_message(unsigned long type,unsigned long *body);
16	void ParseOptions(char *filename);

Added Link Here

(-)x11-wm/fvwm/files/patch-modules__FvwmWinList__Mallocs.h (+13 lines)
1	--- ./modules/FvwmWinList/Mallocs.h.orig 1994-09-14 14:11:34.000000000 +0000
2	+++ ./modules/FvwmWinList/Mallocs.h 2009-03-11 09:42:48.000000000 +0000
3	@@ -18,8 +18,9 @@
4	* own risk. Permission to use this program for any purpose is given,
5	* as long as the copyright is kept intact. */
6
7	+#include "../../libs/fvwmlib.h"
8	+
9	/* Function Prototypes */
10	-char *safemalloc(int length);
11	char saferealloc(char ptr, int length);
12	void sleep_a_little(int n);
13	void CopyString(char *dest, char source);