PERFORCE change 40171 for review

[Andrew Reisse]

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

Change 40171 by areisse at areisse_ibook on 2003/10/22 10:24:32

	fixes for apple compilation

Affected files ...

.. //depot/projects/trustedbsd/sedarwin/sebsd_cmds/checkpolicy/Makefile#1 add
.. //depot/projects/trustedbsd/sedarwin/sebsd_cmds/checkpolicy/checkpolicy.c#2 edit
.. //depot/projects/trustedbsd/sedarwin/sebsd_cmds/checkpolicy/policy_parse.y#2 edit

Differences ...

==== //depot/projects/trustedbsd/sedarwin/sebsd_cmds/checkpolicy/checkpolicy.c#2 (text+ko) ====

@@ -29,7 +29,6 @@
  * the loaded policy configuration.
  */
 
-#ifdef __FreeBSD__
 #include <stdio.h>
 #include <unistd.h>
 #include <errno.h>
@@ -40,10 +39,7 @@
 #include <sys/stat.h>
 #include <sys/mman.h>
 #include <netinet/in.h>
-#include "linux-compat.h"
-#else /* __FreeBSD__ */
-#include <getopt.h>
-#endif /* __FreeBSD__ */
+#include <security/sebsd/linux-compat.h>
 
 #include "global.h"
 #include "policydb.h"

==== //depot/projects/trustedbsd/sedarwin/sebsd_cmds/checkpolicy/policy_parse.y#2 (text+ko) ====

@@ -6,18 +6,16 @@
 /* FLASK */
 
 %{
-#ifdef __FreeBSD__
 #include <stdio.h>
 #include <errno.h>
 #include <sys/types.h>
 #include <netinet/in.h>
-#include "linux-compat.h"
-#endif /* __FreeBSD__ */
+#include <security/sebsd/linux-compat.h>
 #include "policydb.h"
 #include "services.h"
 #include "queue.h"
 #include "checkpolicy.h"
-#include "flask.h"
+#include <security/sebsd/flask.h>
 #include "security.h"
 
 #define TRUE 1
To Unsubscribe: send mail to majordomo at trustedbsd.org
with "unsubscribe trustedbsd-cvs" in the body of the message