summaryrefslogtreecommitdiff
path: root/h
diff options
context:
space:
mode:
authorGravatar Kenneth G Raeburn <raeburn@mit.edu>1991-03-22 14:04:31 +0000
committerGravatar Kenneth G Raeburn <raeburn@mit.edu>1991-03-22 14:04:31 +0000
commite3b556f8fa2e51a3f34266ad671a0d3b1551c088 (patch)
tree391e5e18278e8da15af189aaf0eb06316648faf3 /h
parentc23c40d80555eff7c234ff55a2806f9ef4983f71 (diff)
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.
Diffstat (limited to 'h')
-rw-r--r--h/zephyr/zephyr.h6
1 files changed, 4 insertions, 2 deletions
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;