PERFORCE change 92504 for review

[Robert Watson]

http://perforce.freebsd.org/chv.cgi?CH=92504

Change 92504 by rwatson at rwatson_lethe.cl.cam.ac.uk on 2006/02/28 01:29:46

	Use configure results to decide which queue.h to use.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 (text+ko) ====

@@ -34,19 +34,14 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#12 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#13 $
  */
 
 #ifndef _AUDIT_INTERNAL_H
 #define	_AUDIT_INTERNAL_H
 
-#ifdef __linux__
-#include <compat/queue.h>
-#ifndef __unused
+#if defined(__linux__) && !defined(__unused)
 #define	__unused
-#endif /* !__unused */
-#else
-#include <sys/queue.h>
 #endif
 
 /*

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 (text+ko) ====

@@ -30,11 +30,22 @@
  * 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_audit.c#19 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#20 $
  */
 
 #include <sys/types.h>
 
+#ifdef HAVE_CONFIG_H
+#include <config/config.h>
+#ifdef HAVE_FULL_QUEUE_H
+#include <sys/queue.h>
+#else
+#include <compat/queue.h>
+#endif
+#else /* !HAVE_CONFIG_H */
+#include <sys/queue.h>
+#endif /* !HAVE_CONFIG_H */
+
 #include <bsm/audit_internal.h>
 #include <bsm/libbsm.h>
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 (text+ko) ====

@@ -31,7 +31,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_io.c#32 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#33 $
  */
 
 #include <sys/types.h>
@@ -51,9 +51,15 @@
 #endif /* !HAVE_ENDIAN_H */
 #endif /* !HAVE_MACHINE_ENDIAN_H */
 #include <compat/endian.h>
-#endif /* !HAVE_SYS_ENDIANG_H */
+#endif /* !HAVE_SYS_ENDIAN_H */
+#ifdef HAVE_FULL_QUEUE_H
+#include <sys/queue.h>
+#else /* !HAVE_FULL_QUEUE_H */
+#include <compat/queue.h>
+#endif /* !HAVE_FULL_QUEUE_H */
 #else /* !HAVE_CONFIG_H */
 #include <sys/endian.h>
+#include <sys/queue.h>
 #endif /* !HAVE_CONFIG_H */
 
 #include <sys/stat.h>

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 (text+ko) ====

@@ -27,11 +27,21 @@
  * 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_mask.c#11 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_mask.c#12 $
  */
 
 #include <sys/types.h>
+
+#ifdef HAVE_CONFIG_H
+#include <config/config.h>
+#ifdef HAVE_FULL_QUEUE_H
 #include <sys/queue.h>
+#else /* !HAVE_FULL_QUEUE_H */
+#include <compat/queue.h>
+#endif /* !HAVE_FULL_QUEUE_H */
+#else /* !HAVE_CONFIG_H */
+#include <sys/queue.h>
+#endif /* !HAVE_CONFIG_H */
 
 #include <bsm/libbsm.h>
 

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 (text+ko) ====

@@ -26,18 +26,39 @@
  * 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_notify.c#9 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_notify.c#10 $
  */
 
 /*
  * Based on sample code from Marc Majka.
  */
-#include <string.h>	/* strerror() */
-#include <sys/errno.h>	/* errno */
+#include <sys/types.h>
+
+#ifdef HAVE_CONFIG_H
+
+#include <config/config.h>
+
+#ifdef HAVE_FULL_QUEUE_H
+#include <sys/queue.h>
+#else /* !HAVE_FULL_QUEUE_H */
+#include <compat/queue.h>
+#endif /* !HAVE_FULL_QUEUE_H */
+
+#else /* !HAVE_CONFIG_H */
+
+#include <sys/queue.h>
+
+#endif /* !HAVE_CONFIG_H */
+
+#include <bsm/audit_internal.h>
 #include <bsm/libbsm.h>
-#include <stdint.h>	/* uint32_t */
-#include <syslog.h>	/* syslog() */
-#include <stdarg.h>	/* syslog() */
+
+#include <errno.h>
+#include <stdint.h>
+#include <stdarg.h>
+#include <string.h>
+#include <syslog.h>
+
 
 #ifdef __APPLE__
 #include <notify.h>

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 (text+ko) ====

@@ -30,7 +30,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_token.c#37 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#38 $
  */
 
 #include <sys/types.h>
@@ -51,8 +51,14 @@
 #endif /* !HAVE_MACHINE_ENDIAN_H */
 #include <compat/endian.h>
 #endif /* !HAVE_SYS_ENDIANG_H */
+#ifdef HAVE_FULL_QUEUE_H
+#include <sys/queue.h>
+#else /* !HAVE_FULL_QUEUE_H */
+#include <compat/queue.h>
+#endif /* !HAVE_FULL_QUEUE_H */
 #else /* !HAVE_CONFIG_H */
 #include <sys/endian.h>
+#include <sys/queue.h>
 #endif /* !HAVE_CONFIG_H */
 
 #include <sys/socket.h>

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 (text+ko) ====

@@ -27,7 +27,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_user.c#14 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_user.c#15 $
  */
 
 #include <bsm/libbsm.h>