From 9bbe16d33097b387c5f855de0ca7ba4c67631e67 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Sun, 18 Oct 2009 12:07:37 +0100 Subject: [PATCH] Fix warnings in tviced Prototype hpr_Initialize and hpr_End to remove warnings in the tviced build. Reviewed-on: http://gerrit.openafs.org/675 Reviewed-by: Derrick Brashear Tested-by: Derrick Brashear --- README.WARNINGS | 1 - src/afs/UKERNEL/sysincludes.h | 3 +++ src/config/param.x86_darwin_90.h | 2 -- src/tviced/Makefile.in | 4 ++-- src/viced/host.h | 2 ++ 5 files changed, 7 insertions(+), 5 deletions(-) diff --git a/README.WARNINGS b/README.WARNINGS index f6c40dbf2..5a10fc6b5 100644 --- a/README.WARNINGS +++ b/README.WARNINGS @@ -83,7 +83,6 @@ ubik/ubikclient.c : strict-protos : ubik_Call uss/uss_vol.c : all Format issues uss/uss_kauth.c : all : Des keys, ubik_Call uss/lex.yy.c : all : Unused symbols -viced/afsfileprocs.c : all (tviced) : implicit definiton of hpr_* viced/fsprobe.c : all : ubik_Call vlserver/vlserver.c : all : GetExtendedCellInfo vol/salvager.c : all : consts & undefined variable from header diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h index 8c1e04d75..86458941c 100644 --- a/src/afs/UKERNEL/sysincludes.h +++ b/src/afs/UKERNEL/sysincludes.h @@ -157,6 +157,9 @@ typedef unsigned int fsblkcnt_t; #ifdef AFS_AFSDB_ENV #include +#ifdef HAVE_ARPA_NAMESER_COMPAT_H +#include +#endif #include #endif /* AFS_AFSDB_ENV */ diff --git a/src/config/param.x86_darwin_90.h b/src/config/param.x86_darwin_90.h index 2e4bdf65c..61e674ac3 100644 --- a/src/config/param.x86_darwin_90.h +++ b/src/config/param.x86_darwin_90.h @@ -92,7 +92,6 @@ #define vfs_vnodecovered mnt_vnodecovered #define direct dirent -#define BIND_8_COMPAT #endif #endif /* AFS_PARAM_H */ @@ -181,7 +180,6 @@ #define CMSERVERPREF #endif -#define BIND_8_COMPAT #endif /* AFS_PARAM_H */ #endif /* !defined(UKERNEL) */ diff --git a/src/tviced/Makefile.in b/src/tviced/Makefile.in index 946415a20..f76f451cc 100644 --- a/src/tviced/Makefile.in +++ b/src/tviced/Makefile.in @@ -59,13 +59,13 @@ LIBS=${TOP_LIBDIR}/libafsauthent.a ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/util. all: fileserver state_analyzer rx_pthread.o: ${RX}/rx_pthread.c - ${CCRULE} @CFLAGS_NOERROR@ -DDPF_FSLOG + ${CCRULE} -DDPF_FSLOG viced.o: ${VICED}/viced.c ${CCRULE} afsfileprocs.o: ${VICED}/afsfileprocs.c - ${CCRULE} @CFLAGS_NOERROR@ + ${CCRULE} host.o: ${VICED}/host.c ${CCRULE} diff --git a/src/viced/host.h b/src/viced/host.h index 5f9aa6fcd..932e3c48b 100644 --- a/src/viced/host.h +++ b/src/viced/host.h @@ -259,6 +259,8 @@ extern int h_DeleteHostFromUuidHashTable_r(struct host *host); extern int initInterfaceAddr_r(struct host *host, struct interfaceAddr *interf); extern int addInterfaceAddr_r(struct host *host, afs_uint32 addr, afs_uint16 port); extern int removeInterfaceAddr_r(struct host *host, afs_uint32 addr, afs_uint16 port); +extern afs_int32 hpr_Initialize(struct ubik_client **); +extern int hpr_End(struct ubik_client *); #ifdef AFS_DEMAND_ATTACH_FS -- 2.39.5