TySS-Dev/nearby
1
0
Fork 0
mirror of https://github.com/kidfromjupiter/nearby.git synced 2026-09-16 15:36:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use push and pop to add back the CreateMutex Windows macro to avoid issues in Windows app code.

Browse Source 
PiperOrigin-RevId: 530668276
This commit is contained in:
Nick Bourdakos
2023-05-09 11:36:06 -07:00
committed by Copybara-Service
parent ebab912fb6
commit 182ebad725
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/platform/implementation/platform.h
+5 -4
View File
@@ -56,10 +56,6 @@
#include "internal/platform/os_name.h"
#include "internal/platform/payload_id.h"
#ifdef CreateMutex
#undef CreateMutex
#endif
namespace nearby {
namespace api {
@@ -103,7 +99,12 @@ class ImplementationPlatform {
static std::unique_ptr<CountDownLatch> CreateCountDownLatch(
std::int32_t count);
#pragma push_macro("CreateMutex")
#undef CreateMutex
static std::unique_ptr<Mutex> CreateMutex(Mutex::Mode mode);
#pragma pop_macro("CreateMutex")
static std::unique_ptr<ConditionVariable> CreateConditionVariable(
Mutex* mutex);
internal/platform/implementation/windows/platform.cc
+3 -4
View File
@@ -66,10 +66,6 @@
#include "internal/platform/implementation/windows/wifi_lan.h"
#include "internal/platform/logging.h"
#ifdef CreateMutex
#undef CreateMutex
#endif
namespace nearby {
namespace api {
@@ -183,9 +179,12 @@ std::unique_ptr<CountDownLatch> ImplementationPlatform::CreateCountDownLatch(
return absl::make_unique<shared::CountDownLatch>(count);
}
#pragma push_macro("CreateMutex")
#undef CreateMutex
std::unique_ptr<Mutex> ImplementationPlatform::CreateMutex(Mutex::Mode mode) {
return absl::make_unique<windows::Mutex>(mode);
}
#pragma pop_macro("CreateMutex")
std::unique_ptr<ConditionVariable>
ImplementationPlatform::CreateConditionVariable(Mutex* mutex) {