summaryrefslogtreecommitdiff
path: root/lang/sr/files/patch-rts::io.c
blob: 4b856851b0d2d09b2a9e56bb5d8036b303fe9ed3 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
--- rts/io.c.orig	Sat Dec 13 19:38:54 2003
+++ rts/io.c	Sat Dec 13 19:41:34 2003
@@ -7,7 +7,7 @@
  */
 
 #include <ctype.h>
-#include <varargs.h>
+#include <stdarg.h>
 #include "rts.h"
 
 #define NOTHING			/* for use as null macro arg under ANSI C */
@@ -218,11 +218,9 @@
  */
 /*VARARGS*/
 int
-sr_read (va_alist)
-va_dcl
+sr_read (char *locn, ...)
 {
     va_list ap;
-    char *locn;
     File fp;
     char *argt;
     Array *a;
@@ -238,8 +236,7 @@
     double d;
 
     sr_check_stk (CUR_STACK);
-    va_start (ap);
-    locn = va_arg (ap, char *);
+    va_start (ap, locn);
 
     fp = va_arg (ap, File);
     BEGIN_IO (fp);
@@ -442,8 +439,7 @@
  */
 /*VARARGS*/
 void
-sr_printf (va_alist)
-va_dcl
+sr_printf (char *locn, ...)
 {
     va_list ap;
     File fp;
@@ -451,14 +447,12 @@
     double v;
     char xbuf[20], fbuf[512], dbuf[512], obuf[512];
     int n;
-    char *locn;
     String *str, *sp;
     int ssize;
     Array *arr;
 
     sr_check_stk (CUR_STACK);
-    va_start (ap);
-    locn = va_arg (ap, char *);
+    va_start (ap, locn);
     fp = va_arg (ap, File);
     sp = va_arg (ap, String *);