Merge master

[netatalk.git] / etc / afpd / misc.h

diff --git a/etc/afpd/misc.h b/etc/afpd/misc.h
index 16b7c330b6c28bfe0ea55649959bac916c0d5738..b18826df7be9cb2907672161f5ce0ca38df362cb 100644 (file)
--- a/etc/afpd/misc.h
+++ b/etc/afpd/misc.h
@@ -1,26 +1,25 @@
 #ifndef AFPD_MISC_H
 #define AFPD_MISC_H 1
 
-#include <sys/cdefs.h>
-#include "globals.h"
+#include <atalk/globals.h>
 
 /* FP functions */
 /* messages.c */
-extern int     afp_getsrvrmesg __P((AFPObj *, char *, int, char *, int *));
+int    afp_getsrvrmesg (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
 
 /* afs.c */
-# ifdef AFS
-extern int     afp_getdiracl __P((AFPObj *, char *, int, char *, int *));
-extern int     afp_setdiracl __P((AFPObj *, char *, int, char *, int *));
-# else AFS
+#ifdef AFS
+int    afp_getdiracl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+int    afp_setdiracl (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+#else /* AFS */
 #define afp_getdiracl  NULL
 #define afp_setdiracl  NULL
-# endif AFS
+#endif /* AFS */
 
-# if defined( AFS ) && defined( UAM_AFSKRB )
-extern int     afp_afschangepw __P((AFPObj *, char *, int, char *, int *));
-# else AFS UAM_AFSKRB
+#if defined( AFS ) && defined( UAM_AFSKRB )
+int    afp_afschangepw (AFPObj *obj, char *ibuf, size_t ibuflen, char *rbuf,  size_t *rbuflen);
+#else /* AFS && UAM_AFSKRB */
 #define afp_afschangepw        NULL
-# endif AFS UAM_AFSKRB
+#endif /* AFS && UAM_AFSKRB */
 
 #endif