Gentoo Attachment #19769 for bug #31975

View | Details | Raw Unified
Collapse All | Expand All

(-) xfractint-20.02p05-orig/editpal.c (-10 / +10 lines)

Lines 114-124	Link Here

#endif

#endif

#include <string.h>

#include <string.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <stdarg.h>

#include <stdarg.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

#ifdef __TURBOC__

#ifdef __TURBOC__

#   include <mem.h>   /* to get mem...() declarations */

#   include <mem.h>   /* to get mem...() declarations */

Lines 410-430	Link Here

#ifndef XFRACT

//#ifndef XFRACT

static void displayf(int x, int y, int fg, int bg, char *format, ...)

static void displayf(int x, int y, int fg, int bg, char *format, ...)

#else

/*#else

static void displayf(va_alist)

static void displayf(va_alist)

va_dcl

va_dcl

#endif

#endif*/

   char buff[81];

   char buff[81];

   int  ctr;

   int  ctr;

   va_list arg_list;

   va_list arg_list;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg_list, format);

   va_start(arg_list, format);

#else

/*#else

   int x,y,fg,bg;

   int x,y,fg,bg;

   char *format;

   char *format;

Lines 434-440	Link Here

   fg = va_arg(arg_list,int);

   fg = va_arg(arg_list,int);

   bg = va_arg(arg_list,int);

   bg = va_arg(arg_list,int);

   format = va_arg(arg_list,char *);

   format = va_arg(arg_list,char *);

#endif

#endif*/

   vsprintf(buff, format, arg_list);

   vsprintf(buff, format, arg_list);

   va_end(arg_list);

   va_end(arg_list);

(-) xfractint-20.02p05-orig/fracsubr.c (-21 / +21 lines)

Lines 3-14	Link Here

FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.

FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.

*/

*/

#ifndef XFRACT

//#ifndef XFRACT

#include <stdarg.h>

#include <stdarg.h>

#include <sys/timeb.h>

//#include <sys/timeb.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

#include <sys/types.h>

#include <sys/types.h>

#include <time.h>

#include <time.h>

  /* see Fractint.c for a description of the "include"  hierarchy */

  /* see Fractint.c for a description of the "include"  hierarchy */

Lines 1058-1084	Link Here

*/

*/

#ifndef XFRACT

//#ifndef XFRACT

int put_resume(int len, ...)

int put_resume(int len, ...)

#else

/*#else

int put_resume(va_alist)

int put_resume(va_alist)

va_dcl

va_dcl

#endif

#endif*/

   va_list arg_marker;  /* variable arg list */

   va_list arg_marker;  /* variable arg list */

   BYTE *source_ptr;

   BYTE *source_ptr;

#ifdef XFRACT

/*#ifdef XFRACT

   int len;

   int len;

#endif

#endif*/

   if (resume_info == 0)

   if (resume_info == 0)

      return(-1);

      return(-1);

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg_marker,len);

   va_start(arg_marker,len);

#else

/*#else

   va_start(arg_marker);

   va_start(arg_marker);

   len = va_arg(arg_marker,int);

   len = va_arg(arg_marker,int);

#endif

#endif*/

   while (len)

   while (len)

      source_ptr = (BYTE *)va_arg(arg_marker,char *);

      source_ptr = (BYTE *)va_arg(arg_marker,char *);

Lines 1109-1135	Link Here

   return(0);

   return(0);

#ifndef XFRACT

//#ifndef XFRACT

int get_resume(int len, ...)

int get_resume(int len, ...)

#else

/*#else

int get_resume(va_alist)

int get_resume(va_alist)

va_dcl

va_dcl

#endif

#endif*/

   va_list arg_marker;  /* variable arg list */

   va_list arg_marker;  /* variable arg list */

   BYTE *dest_ptr;

   BYTE *dest_ptr;

#ifdef XFRACT

/*#ifdef XFRACT

   int len;

   int len;

#endif

#endif*/

   if (resume_info == 0)

   if (resume_info == 0)

      return(-1);

      return(-1);

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg_marker,len);

   va_start(arg_marker,len);

#else

/*#else

   va_start(arg_marker);

   va_start(arg_marker);

   len = va_arg(arg_marker,int);

   len = va_arg(arg_marker,int);

#endif

#endif*/

   while (len)

   while (len)

      dest_ptr = (BYTE *)va_arg(arg_marker,char *);

      dest_ptr = (BYTE *)va_arg(arg_marker,char *);

(-) xfractint-20.02p05-orig/fractint.c (-11 / +11 lines)

Lines 6-17	Link Here

#include <string.h>

#include <string.h>

#include <time.h>

#include <time.h>

#include <signal.h>

#include <signal.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <io.h>

//#include <io.h>

#include <stdarg.h>

#include <stdarg.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

#include <ctype.h>

#include <ctype.h>

  /* #include hierarchy for fractint is a follows:

  /* #include hierarchy for fractint is a follows:

Lines 555-566	Link Here

     timer(1,NULL,int width)            decoder

     timer(1,NULL,int width)            decoder

     timer(2)                           encoder

     timer(2)                           encoder

*/

*/

#ifndef XFRACT

//#ifndef XFRACT

int timer(int timertype,int(*subrtn)(),...)

int timer(int timertype,int(*subrtn)(),...)

#else

/*#else

int timer(va_alist)

int timer(va_alist)

va_dcl

va_dcl

#endif

#endif*/

   va_list arg_marker;  /* variable arg list */

   va_list arg_marker;  /* variable arg list */

   char *timestring;

   char *timestring;

Lines 570-584	Link Here

   int i;

   int i;

   int do_bench;

   int do_bench;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg_marker,subrtn);

   va_start(arg_marker,subrtn);

#else

/*#else

   int timertype;

   int timertype;

   int (*subrtn)();

   int (*subrtn)();

   va_start(arg_marker);

   va_start(arg_marker);

   timertype = va_arg(arg_marker, int);

   timertype = va_arg(arg_marker, int);

   subrtn = (int (*)())va_arg(arg_marker, int *);

   subrtn = (int (*)())va_arg(arg_marker, int *);

#endif

#endif*/

   do_bench = timerflag; /* record time? */

   do_bench = timerflag; /* record time? */

   if (timertype == 2)   /* encoder, record time only if debug=200 */

   if (timertype == 2)   /* encoder, record time only if debug=200 */

(-) xfractint-20.02p05-orig/framain2.c (-5 / +5 lines)

Lines 1-11	Link Here

#include <string.h>

#include <string.h>

#include <time.h>

#include <time.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <io.h>

//#include <io.h>

#include <stdarg.h>

#include <stdarg.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

#include <ctype.h>

#include <ctype.h>

  /* see Fractint.c for a description of the "include"  hierarchy */

  /* see Fractint.c for a description of the "include"  hierarchy */

#include "port.h"

#include "port.h"

(-) xfractint-20.02p05-orig/hc.c (-38 / +40 lines)

Lines 56-62	Link Here

#include <io.h>

#include <io.h>

#include <stdarg.h>

#include <stdarg.h>

#else

#else

#include <varargs.h>

#include <stdarg.h>

#define strupr strlwr

#define strupr strlwr

#endif

#endif

#include <fcntl.h>

#include <fcntl.h>

Lines 301-324	Link Here

#ifndef XFRACT

//#ifndef XFRACT

void fatal(int diff, char *format, ...)

void fatal(int diff, char *format, ...)

#else

//#else

void fatal(va_alist)

//void fatal(va_alist)

    va_dcl

//    va_dcl

#endif

//#endif

   va_list arg;

   va_list arg;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg, format);

   va_start(arg, format);

#else

/*#else

   int diff;

   int diff;

   char *format;

   char *format;

   va_start(arg);

   va_start(arg, format);

   diff = va_arg(arg,int);

   diff = va_arg(arg,int);

   format = va_arg(arg,char *);

   format = va_arg(arg,char *);

#endif

#endif

*/

   print_msg("Fatal", srcline-diff, format, arg);

   print_msg("Fatal", srcline-diff, format, arg);

   va_end(arg);

   va_end(arg);

Lines 330-353	Link Here

#ifndef XFRACT

//#ifndef XFRACT

void error(int diff, char *format, ...)

void error(int diff, char *format, ...)

#else

//#else

void error(va_alist)

//void error(int diff, char *format, ...)

    va_dcl

//void error(va_alist)

#endif

//    va_dcl

//#endif

   va_list arg;

   va_list arg;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg, format);

   va_start(arg, format);

#else

//#else

   int diff;

/*   int diff;

   char *format;

   char *format;

   va_start(arg);

   va_start(arg);

   diff = va_arg(arg,int);

   diff = va_arg(arg,int);

   format = va_arg(arg,char *);

   format = va_arg(arg,char *);

#endif

#endif*/

   print_msg("Error", srcline-diff, format, arg);

   print_msg("Error", srcline-diff, format, arg);

   va_end(arg);

   va_end(arg);

Lines 356-378	Link Here

#ifndef XFRACT

//#ifndef XFRACT

void warn(int diff, char *format, ...)

void warn(int diff, char *format, ...)

#else

/*#else

void warn(va_alist)

void warn(va_alist)

   va_dcl

   va_dcl

#endif

#endif*/

   va_list arg;

   va_list arg;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg, format);

   va_start(arg, format);

#else

/*#else

   int diff;

   int diff;

   char *format;

   char *format;

   va_start(arg);

   va_start(arg);

   diff = va_arg(arg, int);

   diff = va_arg(arg, int);

   format = va_arg(arg, char *);

   format = va_arg(arg, char *);

#endif

#endif*/

   print_msg("Warning", srcline-diff, format, arg);

   print_msg("Warning", srcline-diff, format, arg);

   va_end(arg);

   va_end(arg);

Lines 381-427	Link Here

#ifndef XFRACT

//#ifndef XFRACT

void notice(char *format, ...)

void notice(char *format, ...)

#else

/*#else

void notice(va_alist)

void notice(va_alist)

    va_dcl

    va_dcl

#endif

#endif*/

   va_list arg;

   va_list arg;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg, format);

   va_start(arg, format);

#else

/*#else

   char *format;

   char *format;

   va_start(arg);

   va_start(arg);

   format = va_arg(arg,char *);

   format = va_arg(arg,char *);

#endif

#endif*/

   print_msg("Note", srcline, format, arg);

   print_msg("Note", srcline, format, arg);

   va_end(arg);

   va_end(arg);

#ifndef XFRACT

//#ifndef XFRACT

void msg(char *format, ...)

void msg(char *format, ...)

#else

/*#else

void msg(va_alist)

void msg(va_alist)

va_dcl

va_dcl

#endif

#endif*/

   va_list arg;

   va_list arg;

#ifdef XFRACT

/*#ifdef XFRACT

   char *format;

   char *format;

#endif

#endif*/

   if (quiet_mode)

   if (quiet_mode)

      return;

      return;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(arg, format);

   va_start(arg, format);

#else

/*#else

   va_start(arg);

   va_start(arg);

   format = va_arg(arg,char *);

   format = va_arg(arg,char *);

#endif

#endif*/

   print_msg(NULL, 0, format, arg);

   print_msg(NULL, 0, format, arg);

   va_end(arg);

   va_end(arg);

(-) xfractint-20.02p05-orig/jiim.c (-3 / +3 lines)

Lines 40-50	Link Here

#include <string.h>

#include <string.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <stdarg.h>

#include <stdarg.h>

#else

/*#else

#include <varargs.h>

#include <varargs.h>

#endif

#endif*/

#ifdef __TURBOC__

#ifdef __TURBOC__

#   include <mem.h>   /* to get mem...() declarations */

#   include <mem.h>   /* to get mem...() declarations */

(-) xfractint-20.02p05-orig/Makefile (-2 / +5 lines)

Lines 213-220	Link Here

	cp xfractint $(BINDIR)/xfractint

	cp xfractint $(BINDIR)/xfractint

	strip $(BINDIR)/xfractint

	strip $(BINDIR)/xfractint

	chmod a+x $(BINDIR)/xfractint

	chmod a+x $(BINDIR)/xfractint

	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) ./maps/$(MAPFILES) $(SRCDIR)

	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(SRCDIR)

	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )

	mkdir $(SRCDIR)/maps

	(cd maps; cp $(MAPFILES) $(SRCDIR)/maps )

	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) )

	(cd $(SRCDIR)/maps; chmod a+r $(MAPFILES) )

	cp xfractint.man $(MANDIR)/xfractint.1

	cp xfractint.man $(MANDIR)/xfractint.1

	chmod a+r $(MANDIR)/xfractint.1

	chmod a+r $(MANDIR)/xfractint.1

(-) xfractint-20.02p05-orig/memory.c (-5 / +5 lines)

Lines 1-12	Link Here

#include <string.h>

#include <string.h>

#include <limits.h>

#include <limits.h>

#include <malloc.h>

#include <malloc.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <io.h>

//#include <io.h>

#include <stdarg.h>

#include <stdarg.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

#include <ctype.h>

#include <ctype.h>

#include "port.h"

#include "port.h"

(-) xfractint-20.02p05-orig/miscovl.c (-17 / +17 lines)

Lines 5-18	Link Here

#include <string.h>

#include <string.h>

#include <ctype.h>

#include <ctype.h>

#include <time.h>

#include <time.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <malloc.h>

//#include <malloc.h>

#include <process.h>

//#include <process.h>

#include <stdarg.h>

#include <stdarg.h>

#include <io.h>

//#include <io.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

  /* see Fractint.c for a description of the "include"  hierarchy */

  /* see Fractint.c for a description of the "include"  hierarchy */

#include "port.h"

#include "port.h"

#include "prototyp.h"

#include "prototyp.h"

Lines 24-35	Link Here

static void write_batch_parms(char *colorinf,int colorsonly, int maxcolor,int i, int j);

static void write_batch_parms(char *colorinf,int colorsonly, int maxcolor,int i, int j);

static void expand_comments(char far *target, char far *source);

static void expand_comments(char far *target, char far *source);

#ifndef XFRACT

//#ifndef XFRACT

static void put_parm(char *parm,...);

static void put_parm(char *parm,...);

#else

//#else

static void put_parm();

//static void put_parm();

extern  int fake_lut;

extern  int fake_lut;

#endif

//#endif

static void put_parm_line(void);

static void put_parm_line(void);

static int getprec(double,double,double);

static int getprec(double,double,double);

Lines 1200-1223	Link Here

#ifndef XFRACT

//#ifndef XFRACT

static void put_parm(char *parm,...)

static void put_parm(char *parm,...)

#else

/*#else

static void put_parm(va_alist)

static void put_parm(va_alist)

va_dcl

va_dcl

#endif

#endif*/

   char *bufptr;

   char *bufptr;

   va_list args;

   va_list args;

#ifndef XFRACT

//#ifndef XFRACT

   va_start(args,parm);

   va_start(args,parm);

#else

/*#else

   char * parm;

   char * parm;

   va_start(args);

   va_start(args);

   parm = va_arg(args,char *);

   parm = va_arg(args,char *);

#endif

#endif*/

   if (*parm == ' '             /* starting a new parm */

   if (*parm == ' '             /* starting a new parm */

     && wbdata->len == 0)       /* skip leading space */

     && wbdata->len == 0)       /* skip leading space */

      ++parm;

      ++parm;

(-) xfractint-20.02p05-orig/miscres.c (-5 / +5 lines)

Lines 6-17	Link Here

#include <ctype.h>

#include <ctype.h>

#include <time.h>

#include <time.h>

#include <malloc.h>

#include <malloc.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <stdarg.h>

#include <stdarg.h>

#include <io.h>

//#include <io.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

/*#ifdef __TURBOC__

/*#ifdef __TURBOC__

#include <dir.h>

#include <dir.h>

#endif  */

#endif  */

(-) xfractint-20.02p05-orig/printer.c (-15 / +15 lines)

Lines 87-98	Link Here

#include <sys/types.h>

#include <sys/types.h>

#include <errno.h>

#include <errno.h>

#ifndef XFRACT

//#ifndef XFRACT

#include <conio.h>

//#include <conio.h>

#include <stdarg.h>

#include <stdarg.h>

#else

//#else

#include <varargs.h>

//#include <varargs.h>

#endif

//#endif

#include <string.h>

#include <string.h>

Lines 136-146	Link Here

/********      PROTOTYPES     ********/

/********      PROTOTYPES     ********/

#ifndef XFRACT

//#ifndef XFRACT

static void Printer_printf(char far *fmt,...);

static void Printer_printf(char far *fmt,...);

#else

//#else

static void Printer_printf();

//static void Printer_printf();

#endif

//#endif

static int  _fastcall printer(int c);

static int  _fastcall printer(int c);

static void _fastcall print_title(int,int,char *);

static void _fastcall print_title(int,int,char *);

static void printer_reset(void);

static void printer_reset(void);

Lines 1339-1363	Link Here

/* This function prints a string to the the printer with BIOS calls. */

/* This function prints a string to the the printer with BIOS calls. */

#ifndef XFRACT

//#ifndef XFRACT

static void Printer_printf(char far *fmt,...)

static void Printer_printf(char far *fmt,...)

#else

/*#else

static void Printer_printf(va_alist)

static void Printer_printf(va_alist)

va_dcl

va_dcl

#endif

#endif*/

int i;

int i;

char s[500];

char s[500];

int x=0;

int x=0;

va_list arg;

va_list arg;

#ifndef XFRACT

//#ifndef XFRACT

va_start(arg,fmt);

va_start(arg,fmt);

#else

/*#else

char far *fmt;

char far *fmt;

va_start(arg);

va_start(arg);

fmt = va_arg(arg,char far *);

fmt = va_arg(arg,char far *);

#endif

#endif*/

   /* copy far to near string */

   /* copy far to near string */

(-) xfractint-20.02p05-orig/prompts1.c (-2 / +1 lines)

Lines 1980-1987	Link Here

/* subrtn of get_file_entry, separated so that storage gets freed up */

/* subrtn of get_file_entry, separated so that storage gets freed up */

#ifdef XFRACT

#ifdef XFRACT

   static FCODE o_instr[]={"Press "FK_F6" to select different file, "FK_F2" for details,

   static FCODE o_instr[]={"Press "FK_F6" to select different file, "FK_F2" for details, "FK_F4" to toggle sort "};

"FK_F4" to toggle sort "};

/* keep the above split on two lines, the carriage return is needed to keep the

/* keep the above split on two lines, the carriage return is needed to keep the

   line length < 80 characters */

   line length < 80 characters */

#else

#else

(-) xfractint-20.02p05-orig/prototyp.h (-8 / +8 lines)

Lines 370-382	Link Here

extern void calcfracinit(void);

extern void calcfracinit(void);

extern void adjust_corner(void);

extern void adjust_corner(void);

#ifndef XFRACT

//#ifndef XFRACT

extern int put_resume(int ,... );

extern int put_resume(int ,... );

extern int get_resume(int ,... );

extern int get_resume(int ,... );

#else

/*#else

extern int put_resume();

extern int put_resume();

extern int get_resume();

extern int get_resume();

#endif

#endif*/

extern int alloc_resume(int ,int );

extern int alloc_resume(int ,int );

extern int start_resume(void);

extern int start_resume(void);

extern void end_resume(void);

extern void end_resume(void);

Lines 607-619	Link Here

extern int pot_line(BYTE *,int );

extern int pot_line(BYTE *,int );

extern int sound_line(BYTE *,int );

extern int sound_line(BYTE *,int );

extern int sound_line(unsigned char *pixels,int linelen);

extern int sound_line(unsigned char *pixels,int linelen);

#ifndef XFRACT

//#ifndef XFRACT

extern int timer(int,int (*subrtn)(),...);

extern int timer(int,int (*subrtn)(),...);

extern int _cdecl _matherr(struct exception *);

//extern int _cdecl _matherr(struct exception *);

#else

//#else

extern int timer();

//extern int timer();

extern int XZoomWaiting;

extern int XZoomWaiting;

#endif

//#endif*/

extern void clear_zoombox(void);

extern void clear_zoombox(void);

Attachment #19769: patch for xfractint to compile with gcc-3.3.1 for bug #31975