]> git.saurik.com Git - apple/libc.git/commitdiff
Libc-1158.50.2.tar.gz macos-10124 macos-10125 macos-10126 v1158.50.2
authorApple <opensource@apple.com>
Wed, 29 Mar 2017 20:13:52 +0000 (20:13 +0000)
committerApple <opensource@apple.com>
Wed, 29 Mar 2017 20:13:52 +0000 (20:13 +0000)
darwin/compatibility_hacks.c
include/libkern/OSThermalNotification.h

index 04a2dd853b090b28dafa5ad0b3eccba86db38d50..9de6e3c6f976a13e51e87eb8b15564f0bafda8a3 100644 (file)
@@ -49,4 +49,6 @@ ADDED_IN_10_12(dirname_r);
 ADDED_IN_10_12(mkostemp);
 ADDED_IN_10_12(mkostemps);
 
 ADDED_IN_10_12(mkostemp);
 ADDED_IN_10_12(mkostemps);
 
+ADDED_IN_10_12(timingsafe_bcmp);
+
 #endif /* TARGET_OS_IPHONE */
 #endif /* TARGET_OS_IPHONE */
index 02bf1f7f65848c69368f9dd7427fec9201e58a3c..9fe603e9cff18248ecc126e34cdba4d493c20bdc 100644 (file)
 __BEGIN_DECLS
 
 /* Define pressure levels usable by OSThermalPressureLevel */
 __BEGIN_DECLS
 
 /* Define pressure levels usable by OSThermalPressureLevel */
+#if TARGET_OS_IPHONE
+typedef enum {
+       kOSThermalPressureLevelNominal = 0,
+       kOSThermalPressureLevelLight = 10,
+       kOSThermalPressureLevelModerate = 20,
+       kOSThermalPressureLevelHeavy = 30,
+       kOSThermalPressureLevelTrapping = 40,
+       kOSThermalPressureLevelSleeping = 50
+} OSThermalPressureLevel;
+#else
 typedef enum {
        kOSThermalPressureLevelNominal = 0,
        kOSThermalPressureLevelModerate,
 typedef enum {
        kOSThermalPressureLevelNominal = 0,
        kOSThermalPressureLevelModerate,
@@ -46,6 +56,7 @@ typedef enum {
        kOSThermalPressureLevelTrapping,
        kOSThermalPressureLevelSleeping
 } OSThermalPressureLevel;
        kOSThermalPressureLevelTrapping,
        kOSThermalPressureLevelSleeping
 } OSThermalPressureLevel;
+#endif
 
 /*
  ** External notify(3) string for thermal pressure level notification
 
 /*
  ** External notify(3) string for thermal pressure level notification