PERFORCE change 92477 for review

[Robert Watson]

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

Change 92477 by rwatson at rwatson_lethe.cl.cam.ac.uk on 2006/02/27 19:02:36

	Some tweakage of include file use.  This needs to be more
	autoconf'd as we aren't currently doing feature tests for endian.h
	vs machine/endian.h use.  We do do this for sys/endian.h though.
	Likewise, we need proper feature tests to decide whether to use
	the native queue.h or the compat/queue.h in OpenBSM.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 edit
.. //depot/projects/trustedbsd/openbsm/compat/endian.h#6 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 edit

Differences ...

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

@@ -34,13 +34,17 @@
  *
  * @APPLE_BSD_LICENSE_HEADER_END@
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#10 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#11 $
  */
 
 #ifndef _AUDIT_INTERNAL_H
 #define	_AUDIT_INTERNAL_H
 
+#ifdef __linux__
+#include <compat/queue.h>
+#else
 #include <sys/queue.h>
+#endif
 
 /*
  * audit_internal.h contains private interfaces that are shared by user space

==== //depot/projects/trustedbsd/openbsm/compat/endian.h#6 (text+ko) ====

@@ -25,7 +25,7 @@
  * SUCH DAMAGE.
  *
  * Derived from FreeBSD src/sys/sys/endian.h:1.6.
- * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#5 $
+ * $P4: //depot/projects/trustedbsd/openbsm/compat/endian.h#6 $
  */
 
 #ifndef _COMPAT_ENDIAN_H_
@@ -34,7 +34,11 @@
 /*
  * Pick up value of BYTE_ORDER/_BYTE_ORDER if not yet included.
  */
+#ifdef __linux__
+#include <endian.h>
+#else
 #include <machine/endian.h>
+#endif
 
 /*
  * Some systems will have the uint/int types defined here already, others

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

@@ -30,11 +30,10 @@
  * 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#18 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_audit.c#19 $
  */
 
 #include <sys/types.h>
-#include <sys/queue.h>
 
 #include <bsm/audit_internal.h>
 #include <bsm/libbsm.h>

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

@@ -31,15 +31,15 @@
  * 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#29 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_io.c#30 $
  */
 
 #include <sys/types.h>
-#ifdef __APPLE__
+#ifdef HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#else
 #include <compat/endian.h>
-#else /* !__APPLE__ */
-#include <sys/endian.h>
-#endif /* __APPLE__*/
+#endif
 #include <sys/stat.h>
 #include <sys/socket.h>
 

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

@@ -30,15 +30,15 @@
  * 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#34 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#35 $
  */
 
 #include <sys/types.h>
-#ifdef __APPLE__
+#ifdef HAVE_SYS_ENDIAN_H
+#include <sys/endian.h>
+#else
 #include <compat/endian.h>
-#else /* !__APPLE__ */
-#include <sys/endian.h>
-#endif /* __APPLE__*/
+#endif
 #include <sys/socket.h>
 #include <sys/time.h>
 #include <sys/un.h>