From 15cf157d47aafe49fd59b7acc23fe172f8a23566 Mon Sep 17 00:00:00 2001 From: Karl Ramm Date: Fri, 20 Jul 2007 05:07:19 +0000 Subject: debian patch applied and reconciled, version unfinalized --- h/zephyr/zephyr.h | 11 ++++++++--- h/zephyr/zephyr_err.h | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 h/zephyr/zephyr_err.h (limited to 'h/zephyr') diff --git a/h/zephyr/zephyr.h b/h/zephyr/zephyr.h index fc9cd05..713e261 100644 --- a/h/zephyr/zephyr.h +++ b/h/zephyr/zephyr.h @@ -62,14 +62,19 @@ typedef enum { } ZNotice_Kind_t; extern ZCONST char *ZNoticeKinds[9]; +struct _ZTimeval { + int tv_sec; + int tv_usec; +}; + /* Unique ID format */ typedef struct _ZUnique_Id_t { struct in_addr zuid_addr; - struct timeval tv; + struct _ZTimeval tv; } ZUnique_Id_t; /* Checksum */ -typedef unsigned long ZChecksum_t; +typedef unsigned int ZChecksum_t; /* Notice definition */ typedef struct _ZNotice_t { @@ -78,7 +83,7 @@ typedef struct _ZNotice_t { ZNotice_Kind_t z_kind; ZUnique_Id_t z_uid; #define z_sender_addr z_uid.zuid_addr - struct timeval z_time; + struct _ZTimeval z_time; unsigned short z_port; int z_auth; int z_checked_auth; diff --git a/h/zephyr/zephyr_err.h b/h/zephyr/zephyr_err.h new file mode 100644 index 0000000..3fd16e9 --- /dev/null +++ b/h/zephyr/zephyr_err.h @@ -0,0 +1,34 @@ +/* + * zephyr_err.h: + * This file is automatically generated; please do not edit it. + */ + +#define ZERR_PKTLEN (-772103680L) +#define ZERR_HEADERLEN (-772103679L) +#define ZERR_ILLVAL (-772103678L) +#define ZERR_HMPORT (-772103677L) +#define ZERR_PORTINUSE (-772103676L) +#define ZERR_BADPKT (-772103675L) +#define ZERR_VERS (-772103674L) +#define ZERR_NOPORT (-772103673L) +#define ZERR_NONOTICE (-772103672L) +#define ZERR_QLEN (-772103671L) +#define ZERR_HMDEAD (-772103670L) +#define ZERR_INTERNAL (-772103669L) +#define ZERR_NOLOCATIONS (-772103668L) +#define ZERR_NOMORELOCS (-772103667L) +#define ZERR_FIELDLEN (-772103666L) +#define ZERR_BADFIELD (-772103665L) +#define ZERR_SERVNAK (-772103664L) +#define ZERR_AUTHFAIL (-772103663L) +#define ZERR_LOGINFAIL (-772103662L) +#define ZERR_NOSUBSCRIPTIONS (-772103661L) +#define ZERR_NOMORESUBSCRIPTIONS (-772103660L) +#define ZERR_TOOMANYSUBS (-772103659L) +#define ZERR_EOF (-772103658L) +extern void initialize_zeph_error_table(void); +#define ERROR_TABLE_BASE_zeph (-772103680L) + +/* for compatibility with older versions... */ +#define init_zeph_err_tbl initialize_zeph_error_table +#define zeph_err_base ERROR_TABLE_BASE_zeph -- cgit v1.2.3