Date: Tue, 28 Feb 2006 20:58:39 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 92544 for review Message-ID: <200602282058.k1SKwdSl061412@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=92544 Change 92544 by rwatson@rwatson_peppercorn on 2006/02/28 20:58:09 In the Darwin world, sysctl.h includes ucred.h, which depends on queue.h. In Darwin's sysctl.h there is also an include of bsm/audit.h, which in the version shipped with Darwin, performs a nested include of queue.h. However, our version of bsm/audit.h does not include queue.h, since we don't expose queue-based data structures in public BSM include files, which means sysctl.h has a missing dependency. On Darwin, therefore, perform an additional include of sys/queue.h. Ideally, Darwin will explicitly include sys/queue.h in sysctl.h to avoid dependence on the nested include, but this is not currently the case. Reported by: Martin Fong <martin dot fong at sri dot com> Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 (text+ko) ==== @@ -26,7 +26,7 @@ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. * - * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#17 $ + * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_wrappers.c#18 $ */ #ifdef __APPLE__ @@ -35,6 +35,11 @@ #include <sys/param.h> #include <sys/stat.h> + +#ifdef __APPLE__ +#include <sys/queue.h> /* Our bsm/audit.h doesn't include queue.h. */ +#endif + #include <sys/sysctl.h> #include <bsm/libbsm.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200602282058.k1SKwdSl061412>