From e3b556f8fa2e51a3f34266ad671a0d3b1551c088 Mon Sep 17 00:00:00 2001
From: Kenneth G Raeburn <raeburn@mit.edu>
Date: Fri, 22 Mar 1991 14:04:31 +0000
Subject: Try again: When using varargs, declare Z_debug, just without
 arguments.

Also: Make ZNoticeKinds explicitly extern for C++, and prototype for
proc argument to ZSetDebug should use Zconst.
---
 h/zephyr/zephyr.h | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'h')

diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h
index 2f594e5..4160e6b 100644
--- a/h/zephyr/zephyr.h
+++ b/h/zephyr/zephyr.h
@@ -82,7 +82,7 @@ extern "C" {
     /* Packet type */
     typedef enum { UNSAFE, UNACKED, ACKED, HMACK, HMCTL, SERVACK, SERVNAK,
 		       CLIENTACK, STAT } ZNotice_Kind_t;
-    Zconst char *Zconst ZNoticeKinds[((int) STAT) + 1];
+    extern Zconst char *Zconst ZNoticeKinds[((int) STAT) + 1];
 
     /* Unique ID format */
     typedef struct _ZUnique_Id_t {
@@ -222,6 +222,8 @@ extern "C" {
     extern Code_t ZFormatRawNotice Zproto ((ZNotice_t *, char**, int *));
 #ifndef Z_varargs
     extern void Z_debug Zproto ((const char *, ...));
+#else
+    extern void Z_debug ();
 #endif
 
 #ifdef Z_HaveKerberos
@@ -278,7 +280,7 @@ extern "C" {
 
     inline const char* ZGetRealm () { return __Zephyr_realm; }
 
-    inline void ZSetDebug (register void (*proc)(char *,va_list,void *),
+    inline void ZSetDebug (register void (*proc)(Zconst char *,va_list,void *),
 			   void *closure) {
       __Z_debug_print = proc;
       __Z_debug_print_closure = closure;
-- 
cgit v1.2.3