PERFORCE change 94136 for review

Robert Watson rwatson at FreeBSD.org
Mon Mar 27 23:32:02 UTC 2006


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

Change 94136 by rwatson at rwatson_zoo on 2006/03/27 23:31:12

	Use configure results for queue macro inclusion.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 edit
.. //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 (text+ko) ====

@@ -25,11 +25,18 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#2 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd.c#3 $
  */
 
+#include <sys/types.h>
+#include <sys/time.h>
+
+#include <config/config.h>
+#ifdef HAVE_FULL_QUEUE_H
 #include <sys/queue.h>
-#include <sys/time.h>
+#else
+#include <compat/queue.h>
+#endif
 
 #include <bsm/libbsm.h>
 #include <bsm/audit_filter.h>

==== //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#1 $
+ * $P4: //depot/projects/trustedbsd/openbsm/bin/auditfilterd/auditfilterd_conf.c#2 $
  */
 
 /*
@@ -40,7 +40,14 @@
  * and a call to its reinit method fails, we will detach it.
  */
 
+#include <sys/types.h>
+
+#include <config/config.h>
+#ifdef HAVE_FULL_QUEUE_H
 #include <sys/queue.h>
+#else
+#include <compat/queue.h>
+#endif
 
 #include <bsm/libbsm.h>
 #include <bsm/audit_filter.h>


More information about the trustedbsd-cvs mailing list