Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31167/10.4/unstable/main/finkinfo/text
Modified Files:
brs.patch
Log Message:
Don't declare our own malloc() prototype.
Index: brs.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/text/brs.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- brs.patch 20 Jan 2006 20:32:31 -0000 1.1
+++ brs.patch 16 Feb 2006 02:59:24 -0000 1.2
@@ -37,7 +37,6 @@
chmod 644 $(DESTMAN1)/$(MAN); fi
uninstall:; @echo Un-installing $(PROGRAM), $(DATA) and $(MAN)
-Binary files bible.orig/a.out and bible/a.out differ
diff -Nurd bible.orig/bible.c bible/bible.c
--- bible.orig/bible.c 1994-12-12 14:30:47.000000000 -0500
+++ bible/bible.c 2005-12-15 21:37:26.000000000 -0500
@@ -314,7 +313,7 @@
bp += (r_off >> 3);
diff -Nurd bible.orig/tsl.c bible/tsl.c
--- bible.orig/tsl.c 1994-12-11 22:55:31.000000000 -0500
-+++ bible/tsl.c 2005-12-15 21:54:20.000000000 -0500
++++ bible/tsl.c 2006-02-15 21:56:04.000000000 -0500
@@ -94,8 +94,11 @@
|
\*----------------------------------------------------------------------*/
@@ -328,7 +327,16 @@
/* #include <search.h> */
#include "tsl.h"
-@@ -143,9 +146,11 @@
+@@ -109,8 +112,6 @@
+
+ static char rcs_ident[]="@(#)$Header$";
+
+-char *malloc();
+-char *strtok();
+
+ FILE *tfp; /* Text data file pointer */
+ FILE *cfp; /* Concordance data file pointer */
+@@ -143,9 +144,11 @@
int tsl_maxbuffs; /* Maximum number of buffers we're allowed */
int tsl_maxbuffusage=0x100000; /* Max buffer mem usage (bytes) */
@@ -342,7 +350,7 @@
/*----------------------------------------------------------------------
| NAME:
| tsl_error
-@@ -162,15 +167,10 @@
+@@ -162,15 +165,10 @@
|
\*----------------------------------------------------------------------*/
@@ -351,15 +359,15 @@
{
va_list ap;
- char *format;
-
-- va_start(ap);
-
+- va_start(ap);
+
- format = va_arg(ap, char *);
+ va_start(ap, format);
vfprintf(stderr, format, ap);
putc('\n', stderr);
-@@ -180,7 +180,7 @@
+@@ -180,7 +178,7 @@
@@ -368,7 +376,7 @@
/*----------------------------------------------------------------------
| NAME:
| tsl_scan_concordance
-@@ -382,7 +382,7 @@
+@@ -382,7 +380,7 @@
@@ -377,7 +385,7 @@
/*----------------------------------------------------------------------
| NAME:
| tsl_textread
-@@ -547,7 +547,7 @@
+@@ -547,7 +545,7 @@
@@ -386,7 +394,7 @@
/*----------------------------------------------------------------------
| NAME:
| tsl_init
-@@ -681,7 +681,7 @@
+@@ -681,7 +679,7 @@
} /* tsl_init */
@@ -395,7 +403,7 @@
/*----------------------------------------------------------------------
| NAME:
| tsl_close
-@@ -694,7 +694,6 @@
+@@ -694,7 +692,6 @@
\*----------------------------------------------------------------------*/
{
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=103432&bid=230486&dat=121642
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
