[vlc-commits] [Git][videolan/vlc][3.0.x] tools: protoc: fix compilation with recent clang

[Hugo Beauzée-Luyssen (@chouquette)]

Hugo Beauzée-Luyssen pushed to branch 3.0.x at VideoLAN / VLC


Commits:
ff0e412d by Steve Lhomme at 2022-02-22T13:04:52+00:00
tools: protoc: fix compilation with recent clang

Similar to 553ed5fa94c932da67e4cf6bb3a61b52bcbd18e5 found in contribs.

Co-authored-by: Martin Storsjö <martin at martin.st>

- - - - -


2 changed files:

- + extras/tools/protobuf-include-algorithm.patch
- extras/tools/tools.mak


Changes:

=====================================
extras/tools/protobuf-include-algorithm.patch
=====================================
@@ -0,0 +1,14 @@
+--- protobuf/src/google/protobuf/repeated_field.h.orig	2022-02-17 12:44:54.526527423 +0200
++++ protobuf/src/google/protobuf/repeated_field.h	2022-02-17 12:44:58.190446363 +0200
+@@ -46,11 +46,7 @@
+ #ifndef GOOGLE_PROTOBUF_REPEATED_FIELD_H__
+ #define GOOGLE_PROTOBUF_REPEATED_FIELD_H__
+ 
+-#ifdef _MSC_VER
+-// This is required for min/max on VS2013 only.
+ #include <algorithm>
+-#endif
+-
+ #include <string>
+ #include <iterator>
+ #include <google/protobuf/stubs/casts.h>


=====================================
extras/tools/tools.mak
=====================================
@@ -329,6 +329,7 @@ protobuf-$(PROTOBUF_VERSION).tar.gz:
 protobuf: protobuf-$(PROTOBUF_VERSION).tar.gz
 	$(UNPACK)
 	$(APPLY) $(TOOLS)/protobuf-fix-build.patch
+	$(APPLY) $(TOOLS)/protobuf-include-algorithm.patch
 	$(MOVE)
 
 .buildprotoc: protobuf



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ff0e412d421aff53b92fad3a788d982767a093fd

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/ff0e412d421aff53b92fad3a788d982767a093fd
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance