mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 03:19:01 +08:00
fe6e4b711f
* [oatpp] update to 1.2.5 * add version files * update oatcpp libs to 1.2.5 * add version files * use version instead of version string * add version files * update hashes * add version files * fix windows build * add version files * fix windows build * add version files
22 lines
710 B
Diff
22 lines
710 B
Diff
diff --git a/src/oatpp/core/base/Environment.cpp b/src/oatpp/core/base/Environment.cpp
|
|
index b870835..ae36970 100644
|
|
--- a/src/oatpp/core/base/Environment.cpp
|
|
+++ b/src/oatpp/core/base/Environment.cpp
|
|
@@ -36,14 +36,9 @@
|
|
#include <WinSock2.h>
|
|
#endif
|
|
|
|
-#if (defined(WIN32) || defined(_WIN32)) && defined(_WIN64)
|
|
-struct tm* localtime_r(time_t *_clock, struct tm *_result) {
|
|
- _localtime64_s(_result, _clock);
|
|
- return _result;
|
|
-}
|
|
-#elif (defined(WIN32) || defined(_WIN32)) && not defined(_WIN64)
|
|
+#if defined(WIN32) || defined(_WIN32)
|
|
struct tm* localtime_r(time_t *_clock, struct tm *_result) {
|
|
- _localtime32_s(_result, _clock);
|
|
+ localtime_s(_result, _clock);
|
|
return _result;
|
|
}
|
|
#endif
|