diff options
Diffstat (limited to 'cad/magic/patches/patch-ak')
| -rw-r--r-- | cad/magic/patches/patch-ak | 104 |
1 files changed, 11 insertions, 93 deletions
diff --git a/cad/magic/patches/patch-ak b/cad/magic/patches/patch-ak index 324d5605990..6f2e72c3fbc 100644 --- a/cad/magic/patches/patch-ak +++ b/cad/magic/patches/patch-ak @@ -1,95 +1,13 @@ -$NetBSD: patch-ak,v 1.1 2004/01/23 11:43:33 agc Exp $ +$NetBSD: patch-ak,v 1.2 2010/03/03 03:40:00 dmcmahill Exp $ ---- textio/txOutput.c 2004/01/23 10:03:21 1.1 -+++ textio/txOutput.c 2004/01/23 10:05:43 -@@ -42,7 +42,7 @@ - #include "utils/malloc.h" +--- resis/ResRex.c.orig 2009-08-03 13:43:58.000000000 +0000 ++++ resis/ResRex.c +@@ -12,7 +12,7 @@ static char rcsid[] __attribute__ ((unus + /* It is hard to get the value of MAXFLOAT in a portable manner. */ + #if defined(ibm032) + #define MAXFLOAT ((float)3.40282346638528860e+38) +-#elif !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(CYGWIN) && !defined(macosx) ++#elif !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(CYGWIN) && !defined(macosx) && !defined(__DragonFly__) + #include <values.h> + #endif - #ifndef NO_VARARGS --#include <varargs.h> -+#include <stdarg.h> - #endif NO_VARARGS - - /* When a pipe has been opened to "more", the following variables -@@ -82,16 +82,11 @@ - /*VARARGS0*/ - - void --txFprintfBasic(va_alist) --va_dcl -+txFprintfBasic(FILE *f, char *fmt, ...) - { - va_list args; -- char *fmt; -- FILE *f; - -- va_start(args); -- f = va_arg(args, FILE *); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - } -@@ -135,11 +130,9 @@ - /*VARARGS0*/ - - void --TxPrintf(va_alist) --va_dcl -+TxPrintf(char *fmt, ...) - { - va_list args; -- char *fmt; - FILE *f; - - if (txPrintFlag) -@@ -156,16 +149,14 @@ - if (txHavePrompt) - { - TxUnPrompt(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - TxPrompt(); - } - else - { -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - } -@@ -306,11 +297,9 @@ - #ifndef NO_VARARGS - - void --TxError(va_alist) --va_dcl -+TxError(char *fmt, ...) - { - va_list args; -- char *fmt; - FILE *f; - - (void) fflush(stdout); -@@ -321,15 +310,13 @@ - if (txHavePrompt) - { - TxUnPrompt(); -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - TxPrompt(); - } - else { -- va_start(args); -- fmt = va_arg(args, char *); -+ va_start(args, fmt); - (void) GrVfprintf(f, fmt, args); - va_end(args); - } |