libuafs: Don't #define user

libuafs used to #define user to usr_user, so that any references to
'struct user' would become 'struct usr_user'. However, none of the
kernel code uses struct user, and this #define conflicts with the
definitions in sys/user.h on Linux.

So, just remove it.

Thanks to Russ Allbery for the original problem report.

Change-Id: I7868c8ddade2df626f5ecae597144641dfc551b7
Reviewed-on: http://gerrit.openafs.org/2838
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 200a9947f548eb7158e92de62ddaa76fcfe4ba46)
Reviewed-on: http://gerrit.openafs.org/2839
Reviewed-by: Russ Allbery <rra@stanford.edu>
Tested-by: Russ Allbery <rra@stanford.edu>
(cherry picked from commit ca2a73638f124f6bd65bac56bed8f96b1bd1d03a)

diff --git a/src/afs/UKERNEL/sysincludes.h b/src/afs/UKERNEL/sysincludes.h
index 51aea2bdc1f95054cf77a77dcc609f7a14c9adce..0bd771683396979b28db63151a6bc8dff1443337 100644 (file)
--- a/src/afs/UKERNEL/sysincludes.h
+++ b/src/afs/UKERNEL/sysincludes.h
@@ -224,9 +224,6 @@ typedef unsigned int fsblkcnt_t;
 #define vattr                  usr_vattr
 #define buf                    usr_buf
 #define statfs                 usr_statfs
-/* #define ucred               usr_ucred */
-#define user                   usr_user
-/* #define proc                        usr_proc */
 #define file                   usr_file
 #define dirent                 usr_dirent
 #define flock                  usr_flock