darwin afsd include cleanup

remove mach port stuff from non-kernel version (it's for DiskArb)

remove sysconf, iokit, corefoundation, dns_sd from kernel version.

Change-Id: Ibdf9d8a71f5f0fee659d0c05eea4811617c2b34f
Reviewed-on: http://gerrit.openafs.org/2149
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>

diff --git a/src/afsd/afsd.c b/src/afsd/afsd.c
index bda60533b9d36f54892c14844b412c3b4f4a8983..5bc7758776522b9451b512897a9738c9df820ad3 100644 (file)
--- a/src/afsd/afsd.c
+++ b/src/afsd/afsd.c
@@ -167,11 +167,6 @@ void set_staticaddrs(void);
 #include <sys/ioctl.h>
 #include <sys/xattr.h>
 #endif
-#include <mach/mach.h>
-#include <mach/mach_port.h>
-#include <mach/mach_interface.h>
-#include <mach/mach_init.h>
-
 #include <CoreFoundation/CoreFoundation.h>
 
 #include <SystemConfiguration/SystemConfiguration.h>

diff --git a/src/afsd/afsd_kernel.c b/src/afsd/afsd_kernel.c
index 5c58a32ee2ef7895e2f6f7c66680702d6edfe48f..f4d85b2c5438cfe86f5da6c3d74f651739648221 100644 (file)
--- a/src/afsd/afsd_kernel.c
+++ b/src/afsd/afsd_kernel.c
@@ -105,24 +105,6 @@ kern_return_t DiskArbDiskAppearedWithMountpointPing_auto(char *, unsigned int,
 #include <mach/mach_port.h>
 #include <mach/mach_interface.h>
 #include <mach/mach_init.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-
-#include <SystemConfiguration/SystemConfiguration.h>
-#include <SystemConfiguration/SCDynamicStore.h>
-
-#include <IOKit/pwr_mgt/IOPMLib.h>
-#include <IOKit/IOMessage.h>
-
-#include <dns_sd.h>
-
-typedef struct DNSSDState
-{
-    DNSServiceRef       service;
-    CFRunLoopSourceRef  source;
-    CFSocketRef         socket;
-} DNSSDState;
-
 #endif /* AFS_DARWIN_ENV */
 
 #ifndef MOUNT_AFS