update ceph source to reef 18.1.2

[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / zookeeper / win32.patch

diff --git a/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/zookeeper/win32.patch b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/zookeeper/win32.patch
new file mode 100644 (file)
index 0000000..b55f067
--- /dev/null
+++ b/ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/zookeeper/win32.patch
@@ -0,0 +1,29 @@
+diff --git a/zookeeper-client/zookeeper-client-c/src/zk_log.c b/zookeeper-client/zookeeper-client-c/src/zk_log.c\r
+index 436485e..1902b09 100644\r
+--- a/zookeeper-client/zookeeper-client-c/src/zk_log.c\r
++++ b/zookeeper-client/zookeeper-client-c/src/zk_log.c\r
+@@ -108,8 +108,11 @@ static const char* time_now(char* now_str){\r
+     gettimeofday(&tv,0);\r
+ \r
+     now = tv.tv_sec;\r
++#ifdef WIN32\r
++    localtime_s(&lt, &now);\r
++#else\r
+     localtime_r(&now, &lt);\r
+-\r
++#endif\r
+     // clone the format used by log4j ISO8601DateFormat\r
+     // specifically: "yyyy-MM-dd HH:mm:ss,SSS"\r
+ \r
+diff --git a/zookeeper-client/zookeeper-client-c/src/zookeeper.c b/zookeeper-client/zookeeper-client-c/src/zookeeper.c\r
+index 25baa9c..96ed379 100644\r
+--- a/zookeeper-client/zookeeper-client-c/src/zookeeper.c\r
++++ b/zookeeper-client/zookeeper-client-c/src/zookeeper.c\r
+@@ -90,6 +90,7 @@\r
+ #define EAI_ADDRFAMILY WSAEINVAL /* is this still needed? */\r
+ #define EHOSTDOWN EPIPE\r
+ #define ESTALE ENODEV\r
++#define strtok_r strtok_s\r
+ #endif\r
+ \r
+ #define IF_DEBUG(x) if(logLevel==ZOO_LOG_LEVEL_DEBUG) {x;}\r