diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-08-07 17:26:45 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-08-07 17:26:45 +0000 |
| commit | db7b3df3757cc0c25d0ab99a09c98d81fd6490e5 (patch) | |
| tree | 1829b14663f149ae2c4626fbb08bf788ab35e9a9 /lang/elk/files/patch-af | |
| parent | Add an entry for x11-wm/metacity-setup. (diff) | |
fix build on CURRENT
- s|varargs.h|stdarg.h|
- s|void va_start(va_list ap);|void va_start(va_list ap, last);|g
Notes
Notes:
svn path=/head/; revision=86519
Diffstat (limited to 'lang/elk/files/patch-af')
| -rw-r--r-- | lang/elk/files/patch-af | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/lang/elk/files/patch-af b/lang/elk/files/patch-af index 4fc6b0a353b1..8a1a5c547a49 100644 --- a/lang/elk/files/patch-af +++ b/lang/elk/files/patch-af @@ -1,14 +1,34 @@ ---- ../../work.orig/elk-3.0/src/print.c Thu Apr 4 08:25:04 1996 -+++ src/print.c Mon Oct 21 15:48:05 2002 -@@ -5,6 +5,7 @@ +--- src/print.c.orig Thu Apr 4 15:25:04 1996 ++++ src/print.c Thu Aug 7 18:42:43 2003 +@@ -5,7 +5,8 @@ #include <errno.h> #include <ctype.h> +-#include <varargs.h> +#include <string.h> - #include <varargs.h> ++#include <stdarg.h> #ifdef FLUSH_TIOCFLUSH -@@ -555,10 +556,6 @@ + # include <sys/ioctl.h> +@@ -95,15 +96,11 @@ + #endif + + /*VARARGS0*/ +-Printf (va_alist) va_dcl { ++Printf (Object port, char *fmt, ...) { + va_list args; +- Object port; +- char *fmt; + char buf[1024]; + +- va_start (args); +- port = va_arg (args, Object); +- fmt = va_arg (args, char *); ++ va_start (args, fmt); + if (PORT(port)->flags & P_STRING) { + vsprintf (buf, fmt, args); + Print_String (port, buf, strlen (buf)); +@@ -555,10 +552,6 @@ char *p; register c; char buf[256]; @@ -19,7 +39,7 @@ GC_Node; Alloca_Begin; -@@ -573,13 +570,13 @@ +@@ -573,13 +566,13 @@ } else if (c == '%') { Print_Char (port, '\n'); } else if (c == 'e' || c == 'E') { |