kern/131683: 2/14/2009 - CVSup'd to RELENG_7-stable - build kernel with libiconv fails with ../../../libkern/iconv.c: In function 'iconv_mod_unload'

[Adam Hopstetter]

The following reply was made to PR kern/131683; it has been noted by GNATS.

From: Adam Hopstetter <ahopstetter at gmail.com>
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/131683: 2/14/2009 - CVSup'd to RELENG_7-stable - build kernel
 with libiconv fails with ../../../libkern/iconv.c: In function 'iconv_mod_unload'
Date: Sat, 14 Feb 2009 22:43:32 -0500

 This is a multi-part message in MIME format.
 --------------030302040308030504080503
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Sorry ... previous patch posted causes break in buildworld. ... 
 apparrently pf/ftp-proxy.c declares "session" while sys/proc.h does as 
 well .... c++ namespaces anyone?
 
 Attached is the patch that allows for buildkernel and buildworld with 
 kernel libiconv...
 
 Sincerely,
 
 Adam Hopstetter
 
 
 
 
 --------------030302040308030504080503
 Content-Type: text/plain;
  name="new_patch.txt"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: inline;
  filename="new_patch.txt"
 
 --- 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
  
 
 --------------030302040308030504080503--