path: root/x11-misc/xfractint/files/xfractint-20.03p00.patch

diff -Naur xfract-fo-20.03p00-orig/editpal.c xfract-fo-20.03p00/editpal.c
--- xfract-fo-20.03p00-orig/editpal.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/editpal.c	2004-02-02 20:04:39.848745200 +0100
@@ -114,11 +114,11 @@
 #endif
 
 #include <string.h>
-#ifndef XFRACT
+//#ifndef XFRACT
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+//#else
+//#include <varargs.h>
+//#endif
 
 #ifdef __TURBOC__
 #   include <mem.h>   /* to get mem...() declarations */
@@ -410,21 +410,21 @@
    }
 
 
-#ifndef XFRACT
+//#ifndef XFRACT
 static void displayf(int x, int y, int fg, int bg, char *format, ...)
-#else
+/*#else
 static void displayf(va_alist)
 va_dcl
-#endif
+#endif*/
    {
    char buff[81];
    int  ctr;
 
    va_list arg_list;
 
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(arg_list, format);
-#else
+/*#else
    int x,y,fg,bg;
    char *format;
 
@@ -434,7 +434,7 @@
    fg = va_arg(arg_list,int);
    bg = va_arg(arg_list,int);
    format = va_arg(arg_list,char *);
-#endif
+#endif*/
    vsprintf(buff, format, arg_list);
    va_end(arg_list);
 
diff -Naur xfract-fo-20.03p00-orig/fracsubr.c xfract-fo-20.03p00/fracsubr.c
--- xfract-fo-20.03p00-orig/fracsubr.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/fracsubr.c	2004-02-02 20:07:49.061980416 +0100
@@ -3,9 +3,9 @@
 FRACTALS.C, i.e. which are non-fractal-specific fractal engine subroutines.
 */
 
-#ifndef XFRACT
-#include <sys/timeb.h>
-#endif
+//#ifndef XFRACT
+//#include <sys/timeb.h>
+//#endif
 #include <stdarg.h>
 #include <sys/types.h>
 #include <time.h>
diff -Naur xfract-fo-20.03p00-orig/fractint.c xfract-fo-20.03p00/fractint.c
--- xfract-fo-20.03p00-orig/fractint.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/fractint.c	2004-02-02 20:04:39.879740488 +0100
@@ -6,12 +6,12 @@
 #include <string.h>
 #include <time.h>
 #include <signal.h>
-#ifndef XFRACT
-#include <io.h>
+//#ifndef XFRACT
+//#include <io.h>
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+//#else
+//#include <varargs.h>
+//#endif
 #include <ctype.h>
 
   /* #include hierarchy for fractint is a follows:
@@ -531,12 +531,12 @@
      timer(1,NULL,int width)            decoder
      timer(2)                           encoder
   */
-#ifndef XFRACT
+//#ifndef XFRACT
 int timer(int timertype,int(*subrtn)(),...)
-#else
+/*#else
 int timer(va_alist)
 va_dcl
-#endif
+#endif*/
 {
    va_list arg_marker;  /* variable arg list */
    char *timestring;
@@ -546,15 +546,15 @@
    int i;
    int do_bench;
 
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(arg_marker,subrtn);
-#else
+/*#else
    int timertype;
    int (*subrtn)();
    va_start(arg_marker);
    timertype = va_arg(arg_marker, int);
    subrtn = (int (*)())va_arg(arg_marker, int *);
-#endif
+#endif*/
 
    do_bench = timerflag; /* record time? */
    if (timertype == 2)   /* encoder, record time only if debug=200 */
diff -Naur xfract-fo-20.03p00-orig/framain2.c xfract-fo-20.03p00/framain2.c
--- xfract-fo-20.03p00-orig/framain2.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/framain2.c	2004-02-02 20:04:39.905736536 +0100
@@ -1,11 +1,11 @@
 #include <string.h>
 #include <time.h>
-#ifndef XFRACT
-#include <io.h>
+//#ifndef XFRACT
+//#include <io.h>
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+//#else
+//#include <varargs.h>
+//#endif
 #include <ctype.h>
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"
diff -Naur xfract-fo-20.03p00-orig/hc.c xfract-fo-20.03p00/hc.c
--- xfract-fo-20.03p00-orig/hc.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/hc.c	2004-02-02 20:04:39.924733648 +0100
@@ -56,7 +56,7 @@
 #include <io.h>
 #include <stdarg.h>
 #else
-#include <varargs.h>
+#include <stdarg.h>
 #define strupr strlwr
 #endif
 #include <fcntl.h>
@@ -301,24 +301,25 @@
    }
 
 
-#ifndef XFRACT
+//#ifndef XFRACT
 void fatal(int diff, char *format, ...)
-#else
-void fatal(va_alist)
-    va_dcl
-#endif
+//#else
+//void fatal(va_alist)
+//    va_dcl
+//#endif
    {
    va_list arg;
 
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(arg, format);
-#else
+/*#else
    int diff;
    char *format;
-   va_start(arg);
+   va_start(arg, format);
    diff = va_arg(arg,int);
    format = va_arg(arg,char *);
 #endif
+*/
 
    print_msg("Fatal", srcline-diff, format, arg);
    va_end(arg);
@@ -330,24 +331,25 @@
    }
 
 
-#ifndef XFRACT
+//#ifndef XFRACT
 void error(int diff, char *format, ...)
-#else
-void error(va_alist)
-    va_dcl
-#endif
+//#else
+//void error(int diff, char *format, ...)
+//void error(va_alist)
+//    va_dcl
+//#endif
    {
    va_list arg;
 
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(arg, format);
-#else
-   int diff;
+//#else
+/*   int diff;
    char *format;
    va_start(arg);
    diff = va_arg(arg,int);
    format = va_arg(arg,char *);
-#endif
+#endif*/
    print_msg("Error", srcline-diff, format, arg);
    va_end(arg);
 
@@ -356,23 +358,23 @@
    }
 
 
-#ifndef XFRACT
+//#ifndef XFRACT
 void warn(int diff, char *format, ...)
-#else
+/*#else
 void warn(va_alist)
    va_dcl
-#endif
+#endif*/
    {
    va_list arg;
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(arg, format);
-#else
+/*#else
    int diff;
    char *format;
    va_start(arg);
    diff = va_arg(arg, int);
    format = va_arg(arg, char *);
-#endif
+#endif*/
    print_msg("Warning", srcline-diff, format, arg);
    va_end(arg);
 
@@ -381,47 +383,47 @@
    }
 
 
-#ifndef XFRACT
+//#ifndef XFRACT
 void notice(char *format, ...)
-#else
+/*#else
 void notice(va_alist)
     va_dcl
-#endif
+#endif*/
    {
    va_list arg;
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(arg, format);
-#else
+/*#else
    char *format;
 
    va_start(arg);
    format = va_arg(arg,char *);
-#endif
+#endif*/
    print_msg("Note", srcline, format, arg);
    va_end(arg);
    }
 
 
-#ifndef XFRACT
+//#ifndef XFRACT
 void msg(char *format, ...)
-#else
+/*#else
 void msg(va_alist)
 va_dcl
-#endif
+#endif*/
    {
    va_list arg;
-#ifdef XFRACT
+/*#ifdef XFRACT
    char *format;
-#endif
+#endif*/
 
    if (quiet_mode)
       return;
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(arg, format);
-#else
+/*#else
    va_start(arg);
    format = va_arg(arg,char *);
-#endif
+#endif*/
    print_msg(NULL, 0, format, arg);
    va_end(arg);
    }
diff -Naur xfract-fo-20.03p00-orig/jiim.c xfract-fo-20.03p00/jiim.c
--- xfract-fo-20.03p00-orig/jiim.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/jiim.c	2004-02-02 20:04:39.954729088 +0100
@@ -40,11 +40,11 @@
 
 #include <string.h>
 
-#ifndef XFRACT
+//#ifndef XFRACT
 #include <stdarg.h>
-#else
+/*#else
 #include <varargs.h>
-#endif
+#endif*/
 
 #ifdef __TURBOC__
 #   include <mem.h>   /* to get mem...() declarations */
diff -Naur xfract-fo-20.03p00-orig/Makefile xfract-fo-20.03p00/Makefile
--- xfract-fo-20.03p00-orig/Makefile	2003-03-29 18:51:27.000000000 +0100
+++ xfract-fo-20.03p00/Makefile	2004-02-02 20:04:39.962727872 +0100
@@ -213,8 +213,11 @@
 	cp xfractint $(BINDIR)/xfractint
 	strip $(BINDIR)/xfractint
 	chmod a+x $(BINDIR)/xfractint
-	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) ./maps/$(MAPFILES) $(SRCDIR)
-	(cd $(SRCDIR); chmod a+r fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(MAPFILES) )
+	cp fractint.hlp $(PARFILES) $(FRMFILES) $(IFSFILES) $(LFILES) $(SRCDIR)
+	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
 	chmod a+r $(MANDIR)/xfractint.1
 
diff -Naur xfract-fo-20.03p00-orig/memory.c xfract-fo-20.03p00/memory.c
--- xfract-fo-20.03p00-orig/memory.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/memory.c	2004-02-02 20:04:39.965727416 +0100
@@ -1,12 +1,12 @@
 #include <string.h>
 #include <limits.h>
 #include <malloc.h>
-#ifndef XFRACT
-#include <io.h>
+//#ifndef XFRACT
+//#include <io.h>
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+//#else
+//#include <varargs.h>
+//#endif
 #include <ctype.h>
 
 #include "port.h"
diff -Naur xfract-fo-20.03p00-orig/miscovl.c xfract-fo-20.03p00/miscovl.c
--- xfract-fo-20.03p00-orig/miscovl.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/miscovl.c	2004-02-02 20:06:05.635703600 +0100
@@ -5,14 +5,14 @@
 #include <string.h>
 #include <ctype.h>
 #include <time.h>
-#ifndef XFRACT
-#include <malloc.h>
-#include <process.h>
+//#ifndef XFRACT
+//#include <malloc.h>
+//#include <process.h>
 #include <stdarg.h>
-#include <io.h>
-#else
-#include <varargs.h>
-#endif
+//#include <io.h>
+//#else
+//#include <varargs.h>
+//#endif
   /* see Fractint.c for a description of the "include"  hierarchy */
 #include "port.h"
 #include "prototyp.h"
@@ -24,11 +24,11 @@
 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);
 
-#ifndef XFRACT
+//#ifndef XFRACT
 static void put_parm(char *parm,...);
-#else
-static void put_parm();
-#endif
+//#else
+//static void put_parm();
+//#endif
 
 static void put_parm_line(void);
 static int getprec(double,double,double);
@@ -1193,24 +1193,24 @@
       }
 }
 
-#ifndef XFRACT
+//#ifndef XFRACT
 static void put_parm(char *parm,...)
-#else
+/*#else
 static void put_parm(va_alist)
 va_dcl
-#endif
+#endif*/
 {
    char *bufptr;
    va_list args;
 
-#ifndef XFRACT
+//#ifndef XFRACT
    va_start(args,parm);
-#else
+/*#else
    char * parm;
 
    va_start(args);
    parm = va_arg(args,char *);
-#endif
+#endif*/
    if (*parm == ' '             /* starting a new parm */
      && wbdata->len == 0)       /* skip leading space */
       ++parm;
diff -Naur xfract-fo-20.03p00-orig/miscres.c xfract-fo-20.03p00/miscres.c
--- xfract-fo-20.03p00-orig/miscres.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/miscres.c	2004-02-02 20:04:39.979725288 +0100
@@ -6,12 +6,12 @@
 #include <ctype.h>
 #include <time.h>
 #include <malloc.h>
-#ifndef XFRACT
+//#ifndef XFRACT
 #include <stdarg.h>
-#include <io.h>
-#else
-#include <varargs.h>
-#endif
+//#include <io.h>
+//#else
+//#include <varargs.h>
+//#endif
 /*#ifdef __TURBOC__
 #include <dir.h>
 #endif  */
diff -Naur xfract-fo-20.03p00-orig/printer.c xfract-fo-20.03p00/printer.c
--- xfract-fo-20.03p00-orig/printer.c	2004-01-11 13:56:33.000000000 +0100
+++ xfract-fo-20.03p00/printer.c	2004-02-02 20:04:40.021718904 +0100
@@ -87,12 +87,12 @@
 #include <sys/types.h>
 #include <errno.h>
 
-#ifndef XFRACT
-#include <conio.h>
+//#ifndef XFRACT
+//#include <conio.h>
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
+//#else
+//#include <varargs.h>
+//#endif
 
 #include <string.h>
 
@@ -136,11 +136,11 @@
 
 /********      PROTOTYPES     ********/
 
-#ifndef XFRACT
+//#ifndef XFRACT
 static void Printer_printf(char far *fmt,...);
-#else
-static void Printer_printf();
-#endif
+//#else
+//static void Printer_printf();
+//#endif
 static int  _fastcall printer(int c);
 static void _fastcall print_title(int,int,char *);
 static void printer_reset(void);
@@ -1335,25 +1335,25 @@
 
 /* This function prints a string to the the printer with BIOS calls. */
 
-#ifndef XFRACT
+//#ifndef XFRACT
 static void Printer_printf(char far *fmt,...)
-#else
+/*#else
 static void Printer_printf(va_alist)
 va_dcl
-#endif
+#endif*/
 {
 int i;
 char s[500];
 int x=0;
 va_list arg;
 
-#ifndef XFRACT
+//#ifndef XFRACT
 va_start(arg,fmt);
-#else
+/*#else
 char far *fmt;
 va_start(arg);
 fmt = va_arg(arg,char far *);
-#endif
+#endif*/
 
 {
    /* copy far to near string */
diff -Naur xfract-fo-20.03p00-orig/prototyp.h xfract-fo-20.03p00/prototyp.h
--- xfract-fo-20.03p00-orig/prototyp.h	2004-01-11 13:52:36.000000000 +0100
+++ xfract-fo-20.03p00/prototyp.h	2004-02-02 20:04:40.073711000 +0100
@@ -558,13 +558,13 @@
 extern int pot_line(BYTE *,int );
 extern int sound_line(BYTE *,int );
 extern int sound_line(unsigned char *pixels,int linelen);
-#ifndef XFRACT
+//#ifndef XFRACT
 extern int timer(int,int (*subrtn)(),...);
-extern int _cdecl _matherr(struct exception *);
-#else
-extern int timer();
+//extern int _cdecl _matherr(struct exception *);
+//#else
+//extern int timer();
 extern int XZoomWaiting;
-#endif
+//#endif*/
 
 
 extern void clear_zoombox(void);