[vlc-commits] contrib: protobuf: fix GetCurrentTime defition

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon May 14 13:47:45 2018 +0200| [6473d353f16bd2a2f1de99d60443d1c8a792c2d2] | committer: Steve Lhomme

contrib: protobuf: fix GetCurrentTime defition

The same macro check is done elsewhere in the code

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6473d353f16bd2a2f1de99d60443d1c8a792c2d2
---

 contrib/src/protobuf/protobuf-win32.patch | 12 ++++++++++++
 contrib/src/protobuf/rules.mak            |  1 +
 2 files changed, 13 insertions(+)

diff --git a/contrib/src/protobuf/protobuf-win32.patch b/contrib/src/protobuf/protobuf-win32.patch
new file mode 100644
index 0000000000..8d061370ca
--- /dev/null
+++ b/contrib/src/protobuf/protobuf-win32.patch
@@ -0,0 +1,12 @@
+--- protobuf/src/google/protobuf/stubs/time.h	2018-05-14 12:03:13.005476200 +0200
++++ protobuf/src/google/protobuf/stubs/time.h.win32	2018-05-14 12:02:22.476842900 +0200
+@@ -54,6 +54,9 @@ bool LIBPROTOBUF_EXPORT SecondsToDateTim
+ // Returns false if the DateTime is not valid or is not in the valid range.
+ bool LIBPROTOBUF_EXPORT DateTimeToSeconds(const DateTime& time, int64* seconds);
+ 
++#ifdef GetCurrentTime
++#undef GetCurrentTime  // Windows has macro GetCurrentTime
++#endif
+ void LIBPROTOBUF_EXPORT GetCurrentTime(int64* seconds, int32* nanos);
+ 
+ // Formats a time string in RFC3339 fromat.
diff --git a/contrib/src/protobuf/rules.mak b/contrib/src/protobuf/rules.mak
index 6836ec12bf..5ae1dc3c72 100644
--- a/contrib/src/protobuf/rules.mak
+++ b/contrib/src/protobuf/rules.mak
@@ -18,6 +18,7 @@ protobuf: protobuf-$(PROTOBUF_VERSION)-cpp.tar.gz .sum-protobuf
 	$(UNPACK)
 	mv protobuf-$(PROTOBUF_VERSION) protobuf-$(PROTOBUF_VERSION)-cpp
 	$(APPLY) $(SRC)/protobuf/dont-build-protoc.patch
+	$(APPLY) $(SRC)/protobuf/protobuf-win32.patch
 	$(MOVE)
 
 .protobuf: protobuf