fwnn/conflicting-prototypes.patch

113 lines
3.4 KiB
Diff

diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib/js.c FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/js.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib/js.c 2000-03-02 16:32:39.000000000 +0100
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/js.c 2005-04-13 14:31:12.000000000 +0200
@@ -86,7 +86,7 @@
#ifdef hpux
void *malloc (size_t);
#else
-char *malloc ();
+void *malloc (size_t);
#endif /* hpux */
#ifdef SYSVR2
diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib.V3/jlv3.c FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jlib.V3/jlv3.c 2000-02-23 16:55:40.000000000 +0100
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c 2005-04-13 14:31:12.000000000 +0200
@@ -58,7 +58,7 @@
#ifdef SYSVR2
#include <malloc.h>
#else
-extern char *malloc ();
+extern void *malloc (size_t);
#endif
#include "jllib.h"
diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jutil/atod.c FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/atod.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/jutil/atod.c 2000-02-23 16:31:39.000000000 +0100
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/atod.c 2005-04-13 14:31:12.000000000 +0200
@@ -94,7 +94,7 @@
int tnum = 0;
struct uind2 *uhopter;
-char *malloc ();
+void *malloc (size_t);
char *hinsi_file_name = NULL;
diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/history.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/history.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/history.c 2000-02-23 16:31:43.000000000 +0100
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/history.c 2005-04-13 14:34:00.000000000 +0200
@@ -55,7 +55,7 @@
int
init_history ()
{
- char *malloc ();
+ void *malloc (size_t);
int size1;
char *area_pter;
@@ -93,7 +93,7 @@
register w_char *wstr;
register int n;
{
- extern char *malloc ();
+ extern void *malloc (size_t);
if (!history_cunt)
return (0);
diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/jhlp.c 2000-02-23 17:08:49.000000000 +0100
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jhlp.c 2005-04-13 15:05:29.000000000 +0200
@@ -125,7 +125,8 @@
extern char *optarg;
extern int optind;
-extern char *ttyname (), *malloc (), *getenv ();
+extern char *ttyname (), *getenv ();
+extern void *malloc (size_t);
static void save_signals ();
static void restore_signals ();
@@ -1351,7 +1352,7 @@
char *value;
{
extern char **environ;
- char *malloc ();
+ void *malloc (size_t);
char **newenv;
register int i, j;
diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/prologue.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/prologue.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/prologue.c 2000-02-23 16:31:44.000000000 +0100
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/prologue.c 2005-04-13 14:31:12.000000000 +0200
@@ -122,7 +122,7 @@
int
allocate_areas ()
{
- char *malloc ();
+ void *malloc (size_t);
char *area_start;
char *area_pter;
@@ -267,7 +267,7 @@
WnnEnv *save_cur_normal_env = NULL, *save_cur_reverse_env = NULL;
int (*yes_no_func) ();
void (*puts_func) ();
- extern char *malloc ();
+ extern void *malloc (size_t);
if (first == 0)
{
diff -ru FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/termcap.c FreeWnn-1.1.1-a017/Xsi/Wnn/uum/termcap.c
--- FreeWnn-1.1.1-a017.orig/Xsi/Wnn/uum/termcap.c 2000-02-23 16:31:44.000000000 +0100
+++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/termcap.c 2005-04-13 14:31:31.000000000 +0200
@@ -261,7 +261,7 @@
{
char *name1;
char *c;
- extern char *malloc ();
+ extern void *malloc (size_t);
if ((name1 = malloc (strlen (name) + 1024)) == NULL)
{