#include <sys/lock.h>
#include <sys/user.h>
#include <sys/vnode.h>
+#include <sys/kauth.h>
#endif
#include <kern/thread.h>
#define crref kauth_cred_get_with_ref
#define crhold kauth_cred_ref
#ifdef AFS_DARWIN100_ENV
-#define crfree(X) kauth_cred_unref(&X)
+static inline void crfree(kauth_cred_t X) { kauth_cred_unref(&X); }
#else
#define crfree kauth_cred_rele
#endif
#define osi_curcred() &afs_osi_cred
#ifdef AFS_DARWIN80_ENV
-uio_t afsio_darwin_partialcopy(uio_t auio, int size);
-
-#define uprintf printf
+# define afsio_free(X) uio_free(X)
+# define afsio_setoffset(X, Y) uio_setoffset(X, Y)
+# define uprintf printf
#endif
/* Vnode related macros */