From bfc88419b13fc1df44f033dcd3a73a92b2f46693 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 11 Mar 2004 06:30:58 +0000 Subject: [PATCH] rx-user-dont-redefine-isafs-glock-for-ukernel-20040311 rx/UKERNEL/rx_kmutex.h already covers this --- src/rx/rx_user.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rx/rx_user.h b/src/rx/rx_user.h index d63f7c8..a11a4ce 100644 --- a/src/rx/rx_user.h +++ b/src/rx/rx_user.h @@ -23,11 +23,14 @@ error - foo error - foo error - foo #define USERPRI #define AFS_GLOCK() #define AFS_GUNLOCK() -#define ISAFS_GLOCK() #define AFS_ASSERT_GLOCK() #define AFS_RXGLOCK() #define AFS_RXGUNLOCK() -#define ISAFS_RXGLOCK() +#ifndef UKERNEL +/* Defined in rx/UKERNEL/rx_kmutex.h */ +#define ISAFS_GLOCK() +#define ISAFS_RXGLOCK() +#endif #define AFS_ASSERT_RXGLOCK() /* Some "operating-system independent" stuff, for the user mode implementation */ #ifdef UAFS_CLIENT -- 1.9.4