On Mon, Jun 02, 2003 at 10:13:53AM +0200, Andreas Tille wrote: > Anyway I seem to run into trouble to port this package to gcc-3.3. Thus > I tagged the bug "help". If you have any hints/ideas/patched I would care > for a quick upload (or even do not bother about a NMU - which could also > fix the maintainer field).
A patch is attached. It's completely untested, but it does compile. I made one other change, documented in the changelog fragment below, to get rid of some of the nastier compiler warnings. There are a large number of other warnings which should be dealt with at some point, but they don't seem so urgent. * Port from <varargs.h> to <stdarg.h> (closes: #194913). * Modern glibc needs us to use <time.h> rather than <sys/time.h>. Cheers, -- Colin Watson [EMAIL PROTECTED]
only in patch2: unchanged: --- fastlink-4.1P-fix88.orig/4.1P/src/commondefs.h +++ fastlink-4.1P-fix88/4.1P/src/commondefs.h @@ -29,14 +29,14 @@ possibly remove "sys/" from the next 3 lines */ #include <sys/types.h> #include <sys/stat.h> -#include <sys/time.h> +#include <time.h> /* Shriram: end */ /* cgh */ #if !defined(vms) #include <malloc.h> #endif -#include <varargs.h> +#include <stdarg.h> /* VMS: MAY NEED TO CHANGE -- comment out any of the next 3 lines for files your system can't find */ @@ -1169,7 +1169,7 @@ extern int P_eof(); extern int P_eoln(); extern void check_constants(); -extern void printErrMesg(); +extern void printErrMesg(char *format, ...); extern void init_ped_loc_all(); #if ALLELE_SPEED extern int adjust_alleles(); only in patch2: unchanged: --- fastlink-4.1P-fix88.orig/4.1P/src/parmodified.c +++ fastlink-4.1P-fix88/4.1P/src/parmodified.c @@ -12,7 +12,7 @@ and S. K. Gupta */ -#include <sys/time.h> +#include <time.h> #include "commondefs.h" #include "moddefs.h" only in patch2: unchanged: --- fastlink-4.1P-fix88.orig/4.1P/src/unknown.h +++ fastlink-4.1P-fix88/4.1P/src/unknown.h @@ -11,7 +11,7 @@ possibly remove "sys/" from the next 3 lines */ #include <sys/types.h> #include <sys/stat.h> -#include <sys/time.h> +#include <time.h> /* Shriram: end */ #include <string.h> @@ -20,7 +20,7 @@ #if !defined(vms) #include <malloc.h> #endif -#include <varargs.h> +#include <stdarg.h> /* VMS: MAY NEED TO CHANGE -- comment out any of the next 3 lines for files your system can't find */ only in patch2: unchanged: --- fastlink-4.1P-fix88.orig/4.1P/src/iostuff.c +++ fastlink-4.1P-fix88/4.1P/src/iostuff.c @@ -236,15 +236,13 @@ /* Print an error message to stderr, as well as writing to the FASTLINK.err file */ -void printErrMesg(format, va_alist) -char* format; -va_dcl +void printErrMesg(char *format, ...) { time_t secondsNow; FILE* errFile; va_list args; - va_start(args); + va_start(args, format); errFile = fopen("FASTLINK.err", "a"); if (errFile != NULL) {