X-Git-Url: https://git.saurik.com/apple/configd.git/blobdiff_plain/d6c893b2b88c79d2370e2c1a989b792a23b3e0da..d94708881e41bd90afd74b1a1dd0524d039ba3f7:/SystemConfiguration.fproj/SCPreferencesPathKey.h?ds=inline

diff --git a/SystemConfiguration.fproj/SCPreferencesPathKey.h b/SystemConfiguration.fproj/SCPreferencesPathKey.h
index 60b0dd5..3d0f540 100644
--- a/SystemConfiguration.fproj/SCPreferencesPathKey.h
+++ b/SystemConfiguration.fproj/SCPreferencesPathKey.h
@@ -1,15 +1,15 @@
 /*
- * Copyright (c) 2004, 2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004, 2005, 2008, 2018 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * compliance with the License. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this
  * file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -17,19 +17,17 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_LICENSE_HEADER_END@
  */
 
 #ifndef _SCPREFERENCESPATHKEY_H
 #define _SCPREFERENCESPATHKEY_H
 
-#include <AvailabilityMacros.h>
+#include <os/availability.h>
 #include <sys/cdefs.h>
 #include <CoreFoundation/CoreFoundation.h>
 
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1040
-
 /*!
 	@header SCPreferencesPathKey
  */
@@ -50,7 +48,7 @@ SCPreferencesPathKeyCreate			(
 						CFAllocatorRef	allocator,
 						CFStringRef	fmt,
 						...
-						)				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						)				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateNetworkServices
@@ -58,7 +56,7 @@ SCPreferencesPathKeyCreate			(
 CFStringRef
 SCPreferencesPathKeyCreateNetworkServices	(
 						CFAllocatorRef	allocator
-						)				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						)				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateNetworkServiceEntity
@@ -68,7 +66,7 @@ SCPreferencesPathKeyCreateNetworkServiceEntity	(
 						CFAllocatorRef	allocator,
 						CFStringRef	service,
 						CFStringRef	entity
-						)				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						)				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateSets
@@ -76,7 +74,7 @@ SCPreferencesPathKeyCreateNetworkServiceEntity	(
 CFStringRef
 SCPreferencesPathKeyCreateSets			(
 						CFAllocatorRef	allocator
-						)				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						)				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateSet
@@ -85,7 +83,7 @@ CFStringRef
 SCPreferencesPathKeyCreateSet			(
 						CFAllocatorRef	allocator,
 						CFStringRef	set
-						)				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						)				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateSetNetworkInterfaceEntity
@@ -96,7 +94,7 @@ SCPreferencesPathKeyCreateSetNetworkInterfaceEntity(
 						   CFStringRef	set,
 						   CFStringRef	ifname,
 						   CFStringRef	entity
-						   )				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						   )				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateSetNetworkGlobalEntity
@@ -106,7 +104,7 @@ SCPreferencesPathKeyCreateSetNetworkGlobalEntity(
 						CFAllocatorRef	allocator,
 						CFStringRef	set,
 						CFStringRef	entity
-						)				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						)				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateSetNetworkService
@@ -116,7 +114,7 @@ SCPreferencesPathKeyCreateSetNetworkService     (
 						CFAllocatorRef	allocator,
 						CFStringRef	set,
 						CFStringRef	service
-						)				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						)				API_AVAILABLE(macos(10.4), ios(2.0));
 
 /*!
 	@function SCPreferencesPathKeyCreateSetNetworkServiceEntity
@@ -127,10 +125,8 @@ SCPreferencesPathKeyCreateSetNetworkServiceEntity(
 						 CFStringRef	set,
 						 CFStringRef	service,
 						 CFStringRef	entity
-						 )				AVAILABLE_MAC_OS_X_VERSION_10_4_AND_LATER;
+						 )				API_AVAILABLE(macos(10.4), ios(2.0));
 
 __END_DECLS
 
-#endif	/* MAC_OS_X_VERSION_MAX_ALLOWED >= 1040 */
-
-#endif /* _SCPREFERENCESPATHKEY_H */
+#endif	/* _SCPREFERENCESPATHKEY_H */