elk (3.0-13) unstable; urgency=low

* Fixed gcc-3.3 compilation errors due to deprecated usage of <varargs.h>.
 -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 30 May 2003 17:04:56 +0200


git-svn-id: svn://svn.zoy.org/elk/trunk@7 55e467fa-43c5-0310-a8a2-de718669efc6

debian/README.Debian

@@ -30,4 +30,4 @@ $install_dir/lib/ldflags		/usr/bin/ldflags-elk
 
 
  -- Enrique Zanardi <ezanard@debian.org>  Mon, 26 Mar 2001 20:19:04 +0100
- -- Samuel Hocevar <sam@zoy.org>  Mon, 31 Mar 2003 15:00:23 +0200
+ -- Sam Hocevar <sam@zoy.org>  Mon, 31 Mar 2003 15:00:23 +0200

debian/changelog

@@ -1,3 +1,10 @@
+elk (3.0-13) unstable; urgency=low
+
+  * Fixed gcc-3.3 compilation errors due to deprecated usage of <varargs.h>.
+  * Set policy to 3.5.10.
+
+ -- Sam Hocevar (Debian packages) <sam+deb@zoy.org>  Fri, 30 May 2003 17:04:56 +0200
+
 elk (3.0-12) unstable; urgency=low
 
   * Fixed generation of /usr/lib/elk/module.a (needed to build sced).

debian/control

@@ -1,7 +1,7 @@
 Source: elk
 Section: devel
 Priority: optional
-Maintainer: Samuel Hocevar <sam@zoy.org>
+Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
 Build-Depends: debhelper (>> 3.0.0), libelfg0-dev, xlibs-dev, lesstif-dev, libgdbmg1-dev, libxaw7-dev
 Standards-Version: 3.5.9.0
 

include/extern.h

@@ -82,8 +82,8 @@ extern Object The_Environment, Global_Environment;
 
 /* Error handling
  */
-extern void Primitive_Error P_((ELLIPSIS)) __attribute__ ((__noreturn__));
-extern void Fatal_Error P_((ELLIPSIS)) __attribute__ ((__noreturn__));
+extern void Primitive_Error P_((const char*, ...)) __attribute__ ((__noreturn__));
+extern void Fatal_Error P_((const char*, ...)) __attribute__ ((__noreturn__));
 extern void Range_Error P_((Object));
 extern void Panic P_((const char*));
 extern Object P_Error P_((int, Object*));
@@ -313,7 +313,7 @@ extern Object P_Print P_((int, Object*));
 extern Object P_Get_Output_String P_((Object));
 extern void Check_Output_Port P_((Object));
 extern void Discard_Output P_((Object));
-extern void Printf P_((ELLIPSIS));
+extern void Printf P_((Object, const char *, ...));
 extern void Print_Object P_((Object, Object, int, int, int));
 extern void General_Print_Object P_((Object, Object, int));
 extern void Format P_((Object, const char*, int, int, Object*));
@@ -433,7 +433,7 @@ extern Object Bits_To_Symbols P_((unsigned long int, int, SYMDESCR*));
  */
 extern void Register_Object P_((Object, GENERIC, PFO, int));
 extern void Deregister_Object P_((Object));
-extern Object Find_Object P_((ELLIPSIS));
+extern Object Find_Object P_((int, GENERIC, MATCHFUN, ...));
 extern void Terminate_Group P_((GENERIC));
 extern void Terminate_Type P_((int));
 

lib/xlib/objects.c

@@ -1,4 +1,4 @@
-#include <varargs.h>
+#include <stdarg.h>
 
 #include "xlib.h"
 

lib/xt/objects.c

@@ -1,4 +1,4 @@
-#include <varargs.h>
+#include <stdarg.h>
 
 #include "xt.h"
 

src/error.c

@@ -1,5 +1,5 @@
 #include <ctype.h>
-#include <varargs.h>
+#include <stdarg.h>
 #include <stdlib.h>
 
 #include "kernel.h"
@@ -42,15 +42,13 @@ void Set_App_Name (char *name) {
 
 #ifdef lint
 /*VARARGS1*/
-void Fatal_Error (char *foo) { foo = foo; }
+void Fatal_Error (const char *foo) { foo = foo; }
 #else
-void Fatal_Error (va_alist) va_dcl {
+void Fatal_Error (const char *fmt, ...) {
     va_list args;
-    char *fmt;
 
     Disable_Interrupts;
-    va_start (args);
-    fmt = va_arg (args, char *);
+    va_start (args, fmt);
     (void)fflush (stdout);
     if (appname)
 	fprintf (stderr, "\n%s: fatal error: ", appname);
@@ -91,17 +89,16 @@ void Uncatchable_Error (char *errmsg) {
 
 #ifdef lint
 /*VARARGS1*/
-void Primitive_Error (char *foo) { foo = foo; }
+void Primitive_Error (const char *foo) { foo = foo; }
 #else
-void Primitive_Error (va_alist) va_dcl {
+void Primitive_Error (const char *fmt, ...) {
     va_list args;
-    register char *p, *fmt;
+    register const char *p;
     register int i, n;
     Object msg, sym, argv[10];
     GC_Node; GCNODE gcv;
 
-    va_start (args);
-    fmt = va_arg (args, char *);
+    va_start (args, fmt);
     for (n = 0, p = fmt; *p; p++)
 	if (*p == '~' && p[1] != '~' && p[1] != '%'
 		&& p[1] != 'E' && p[1] != 'e')

src/print.c

@@ -6,7 +6,7 @@
 #include <string.h>
 #include <errno.h>
 #include <ctype.h>
-#include <varargs.h>
+#include <stdarg.h>
 
 #ifdef FLUSH_TIOCFLUSH
 #  include <sys/ioctl.h>
@@ -107,15 +107,11 @@ void vsprintf (register char *s, register char *fmt, va_list ap) {
 #endif
 
 /*VARARGS0*/
-void Printf (va_alist) va_dcl {
+void Printf (Object port, const 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));

src/terminate.c

@@ -1,7 +1,7 @@
 /* Termination functions, weak pointers.
  */
 
-#include <varargs.h>
+#include <stdarg.h>
 #include <stdlib.h>
 
 #include "kernel.h"
@@ -51,17 +51,11 @@ void Deregister_Object (Object obj) {
  * Null is returned when the object has not been found.
  */
 /*VARARGS*/
-Object Find_Object (va_alist) va_dcl {
+Object Find_Object (int type, GENERIC group, MATCHFUN match, ...) {
     WEAK_NODE *p;
-    int type;
-    GENERIC group;
-    MATCHFUN match;
     va_list args;
 
-    va_start (args);
-    type = va_arg (args, int);
-    group = va_arg (args, GENERIC);
-    match = va_arg (args, MATCHFUN);
+    va_start (args, match);
     for (p = first; p; p = p->next) {
 	if (TYPE(p->obj) != type || p->group != group)
 	    continue;