libuafs: Don't #define user
authorSimon Wilkinson <sxw@inf.ed.ac.uk>
Thu, 23 Sep 2010 07:58:21 +0000 (08:58 +0100)
committerDerrick Brashear <shadow@dementia.org>
Thu, 23 Sep 2010 09:05:08 +0000 (02:05 -0700)
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>

src/afs/UKERNEL/sysincludes.h

index 51aea2b..0bd7716 100644 (file)
@@ -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