Revision

22913

Author

zarzycki@apple.com

Date

2006-10-23 14:04:26 -0700 (Mon, 23 Oct 2006)

Log Message

More header housekeeping.

Modified Paths

• trunk/launchd/src/launch_priv.h
• trunk/launchd/src/launchd.c
• trunk/launchd/src/launchd_core_logic.c
• trunk/launchd/src/launchd_runtime.c
• trunk/launchd/src/launchd_runtime.h
• trunk/launchd/src/launchd_unix_ipc.c
• trunk/launchd/src/launchd_unix_ipc.h
• trunk/launchd/src/libbootstrap.c
• trunk/launchd/src/liblaunch.c
• trunk/launchd/src/libvproc.c
• trunk/launchd/src/vproc_priv.h

Diff

--- trunk/launchd/src/launch_priv.h	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/launch_priv.h	2006-10-23 21:04:26 UTC (rev 22913)
@@ -20,6 +20,7 @@
 #ifndef _LAUNCH_PRIV_H_
 #define _LAUNCH_PRIV_H_
 
+#include <sys/types.h>
 #include <launch.h>
 
 #pragma GCC visibility push(default)

--- trunk/launchd/src/launchd.c	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/launchd.c	2006-10-23 21:04:26 UTC (rev 22913)
@@ -20,6 +20,9 @@
 
 static const char *const __rcs_file_version__ = "$Revision$";
 
+#include "config.h"
+#include "launchd.h"
+
 #include <Security/Authorization.h>
 #include <Security/AuthorizationTags.h>
 #include <Security/AuthSession.h>
@@ -65,7 +68,6 @@
 #include "vproc_priv.h"
 #include "launch.h"
 #include "launch_priv.h"
-#include "launchd.h"
 #include "launchd_runtime.h"
 #include "launchd_core_logic.h"
 #include "launchd_unix_ipc.h"

--- trunk/launchd/src/launchd_core_logic.c	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/launchd_core_logic.c	2006-10-23 21:04:26 UTC (rev 22913)
@@ -20,6 +20,9 @@
 
 static const char *const __rcs_file_version__ = "$Revision$";
 
+#include "config.h"
+#include "launchd_core_logic.h"
+
 #include <mach/mach.h>
 #include <mach/mach_error.h>
 #include <mach/boolean.h>
@@ -74,7 +77,6 @@
 #include "launch_priv.h"
 #include "launchd.h"
 #include "launchd_runtime.h"
-#include "launchd_core_logic.h"
 #include "launchd_unix_ipc.h"
 #include "bootstrap_public.h"
 #include "vproc_priv.h"

--- trunk/launchd/src/launchd_runtime.c	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/launchd_runtime.c	2006-10-23 21:04:26 UTC (rev 22913)
@@ -20,6 +20,9 @@
 
 static const char *const __rcs_file_version__ = "$Revision$";
 
+#include "config.h"
+#include "launchd_runtime.h"
+
 #include <mach/mach.h>
 #include <mach/mach_error.h>
 #include <mach/boolean.h>
@@ -47,8 +50,6 @@
 #include <stdbool.h>
 #include <syslog.h>
 
-#include "launchd_runtime.h"
-
 #include "launchd_internalServer.h"
 #include "launchd_internal.h"
 #include "notifyServer.h"

--- trunk/launchd/src/launchd_runtime.h	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/launchd_runtime.h	2006-10-23 21:04:26 UTC (rev 22913)
@@ -21,6 +21,9 @@
 #define __LAUNCHD_RUNTIME_H__
 
 #include <mach/mach.h>
+#include <sys/types.h>
+#include <bsm/libbsm.h>
+#include <stdbool.h>
 
 struct ldcred {
 	uid_t   euid;

--- trunk/launchd/src/launchd_unix_ipc.c	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/launchd_unix_ipc.c	2006-10-23 21:04:26 UTC (rev 22913)
@@ -20,6 +20,9 @@
 
 static const char *const __rcs_file_version__ = "$Revision$";
 
+#include "config.h"
+#include "launchd_unix_ipc.h"
+
 #include <sys/types.h>
 #include <sys/queue.h>
 #include <sys/event.h>
@@ -50,7 +53,6 @@
 #include "launchd.h"
 #include "launchd_runtime.h"
 #include "launchd_core_logic.h"
-#include "launchd_unix_ipc.h"
 
 extern char **environ;
 

--- trunk/launchd/src/launchd_unix_ipc.h	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/launchd_unix_ipc.h	2006-10-23 21:04:26 UTC (rev 22913)
@@ -20,6 +20,12 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
+#include <sys/queue.h>
+
+#include "launchd_runtime.h"
+#include "launchd_core_logic.h"
+#include "launch_priv.h"
+
 struct conncb {
 	kq_callback kqconn_callback;
 	SLIST_ENTRY(conncb) sle;

--- trunk/launchd/src/libbootstrap.c	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/libbootstrap.c	2006-10-23 21:04:26 UTC (rev 22913)
@@ -18,20 +18,14 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
+#include "config.h"
+#include "bootstrap_public.h"
+
 #include <mach/mach.h>
 #include <mach/vm_map.h>
 
-#include "bootstrap_public.h"
-#include "vproc_priv.h"
-#include "launch.h"
-#include "launch_priv.h"
-
 #include "protocol_vproc.h"
 
-#include <sys/param.h>
-#include <stdlib.h>
-#include <errno.h>
-
 kern_return_t
 bootstrap_create_server(mach_port_t bp, cmd_t server_cmd, uid_t server_uid, boolean_t on_demand, mach_port_t *server_port)
 {

--- trunk/launchd/src/liblaunch.c	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/liblaunch.c	2006-10-23 21:04:26 UTC (rev 22913)
@@ -17,6 +17,11 @@
  * 
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
+
+#include "config.h"
+#include "launch.h"
+#include "launch_priv.h"
+
 #include <mach/mach.h>
 #include <libkern/OSByteOrder.h>
 #include <sys/types.h>
@@ -33,8 +38,6 @@
 #include <errno.h>
 #include <pwd.h>
 
-#include "launch.h"
-#include "launch_priv.h"
 #include "bootstrap_public.h"
 #include "vproc_priv.h"
 

--- trunk/launchd/src/libvproc.c	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/libvproc.c	2006-10-23 21:04:26 UTC (rev 22913)
@@ -18,11 +18,13 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
+#include "config.h"
+#include "vproc.h"
+#include "vproc_priv.h"
+
 #include <mach/mach.h>
 #include <mach/vm_map.h>
 
-#include "bootstrap_public.h"
-#include "vproc_priv.h"
 #include "launch.h"
 #include "launch_priv.h"
 

--- trunk/launchd/src/vproc_priv.h	2006-10-23 20:19:58 UTC (rev 22912)
+++ trunk/launchd/src/vproc_priv.h	2006-10-23 21:04:26 UTC (rev 22913)
@@ -1,5 +1,5 @@
-#ifndef _BOOTSTRAP_PRIVATE_H_
-#define _BOOTSTRAP_PRIVATE_H_
+#ifndef _VPROC_PRIVATE_H_
+#define _VPROC_PRIVATE_H_
 /*
  * Copyright (c) 2006 Apple Computer, Inc. All rights reserved.
  *
@@ -20,6 +20,8 @@
  * @APPLE_APACHE_LICENSE_HEADER_END@
  */
 
+#include <mach/mach.h>
+#include "bootstrap_public.h"
 
 typedef char * _internal_string_t;
 typedef mach_port_t vproc_mig_t;