Error compiling FreeBSD-Stable with MFC'ed iconv locking

[Adam Hopstetter]

Hello,

    I also had the exact same issue compiling FreeBSD-7.1-stable on 
2/14/2009. If you implement the described patch ... freebsd-7.1-stable 
will them fail to build world with an error in pf/ftp-proxy.c, 
complaining about a redefinition of 'session'. This is b/c sys/proc.h 
also defines 'session' ... so there treading on each other's namespace ....

Below is an updated patch to compile kernel and world with kernel 
libiconv support.

--- sys/sys/sx.h.orig 2009-02-14 15:49:28.000000000 -0500
+++ sys/sys/sx.h 2009-02-14 21:38:04.000000000 -0500
@@ -37,6 +37,7 @@
#include <sys/lock_profile.h>

#ifdef _KERNEL
+#include <sys/proc.h>
#include <machine/atomic.h>
#endif




Sincerely,

Adam Hopstetter