兼容Xcode14.3

zhenglibao · Apr 13, 2023 · ca67797 · ca67797
1 parent 75e2776
commit ca67797
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/FlexLib.podspec b/FlexLib.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'FlexLib'
-  s.version          = '3.2.0'
+  s.version          = '3.2.1'
   s.summary          = 'An obj-c flex layout framework for IOS & mac'
 
 # This description is used to generate tags and improve search results.

diff --git a/FlexLib/Classes/Flexlib/FlexUtils.m b/FlexLib/Classes/Flexlib/FlexUtils.m
@@ -254,7 +254,7 @@ BOOL IsPortrait(void)
     return [UIApplication sharedApplication].delegate.window;
 }
 
-double GetAccurateSecondsSince1970()
+double GetAccurateSecondsSince1970(void)
 {
     struct timeval now ;
     gettimeofday(&now,NULL);

diff --git a/FlexLib/Classes/yoga/Yoga.cpp b/FlexLib/Classes/yoga/Yoga.cpp
@@ -2229,7 +2229,7 @@ static float YGDistributeFreeSpaceSecondPass(
         depth,
         generationCount);
     node->setLayoutHadOverflow(
-        node->getLayout().hadOverflow() |
+        node->getLayout().hadOverflow() ||
         currentRelativeChild->getLayout().hadOverflow());
   }
   return deltaFreeSpace;