Fix more compilation errors

project-chip · Jun 2, 2023 · eff67ec · eff67ec
1 parent 9416169
commit eff67ec
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/src/app/clusters/door-lock-server/door-lock-server.cpp b/src/app/clusters/door-lock-server/door-lock-server.cpp
@@ -3313,8 +3313,8 @@ bool DoorLockServer::HandleRemoteLockOperation(chip::app::CommandHandler * comma
 
     EndpointId endpoint       = commandPath.mEndpointId;
     OperationErrorEnum reason = OperationErrorEnum::kUnspecified;
-    Nullable<uint16_t> pinUserIdx;                                  // Will get set to non-null if we find a user for the PIN.
-    Optional<uint16_t> pinCredIdx{ Optional<uint16_t>::Missing() }; // Will get set to a value if the PIN is one we know about.
+    Nullable<uint16_t> pinUserIdx; // Will get set to non-null if we find a user for the PIN.
+    Optional<uint16_t> pinCredIdx; // Will get set to a value if the PIN is one we know about.
     bool success   = false;
     bool sendEvent = true;
 

diff --git a/src/system/SystemConfig.h b/src/system/SystemConfig.h
@@ -725,7 +725,7 @@ struct LwIPEvent;
  *  Defaults to enabled on Zephyr platforms that do not enable Zephyr POSIX layer.
  */
 #ifndef CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS
-#if CHIP_SYSTEM_CONFIG_USE_SOCKETS && __ZEPHYR__ && !CONFIG_POSIX_API
+#if CHIP_SYSTEM_CONFIG_USE_SOCKETS && __ZEPHYR__ && CONFIG_NET_SOCKETS_POSIX_NAMES
 #define CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS 1
 #else
 #define CHIP_SYSTEM_CONFIG_USE_ZEPHYR_SOCKETS 0

diff --git a/src/system/WakeEvent.cpp b/src/system/WakeEvent.cpp
@@ -144,14 +144,14 @@ int WriteEvent(int eventFd)
 
 #else
 
-int ReadEvent(int eventFd)
+ssize_t ReadEvent(int eventFd)
 {
     uint64_t value;
 
     return ::read(eventFd, &value, sizeof(value));
 }
 
-int WriteEvent(int eventFd)
+ssize_t WriteEvent(int eventFd)
 {
     uint64_t value = 1;