From ca67797970aed6a41817f643741a0f62e57da34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E7=AB=8B=E5=AE=9D?= <zhenglibao@kanzhun.com>
Date: Thu, 13 Apr 2023 15:34:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9Xcode14.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FlexLib.podspec                     | 2 +-
 FlexLib/Classes/Flexlib/FlexUtils.m | 2 +-
 FlexLib/Classes/yoga/Yoga.cpp       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/FlexLib.podspec b/FlexLib.podspec
index 1b2b8d5..8bf6b7e 100644
--- 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
index dcb1db0..dd862cc 100644
--- 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
index 2c68674..ea95e40 100644
--- 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;