[Libreoffice-commits] core.git: external/liblangtag

Stephan Bergmann sbergman at redhat.com
Tue Sep 27 15:33:00 UTC 2016


 external/liblangtag/clang-cl.patch.0 |   21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

New commits:
commit 0901c29d522f03c29c60fcda537918c2bf9eda63
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 27 17:30:23 2016 +0200

    Adapt external/liblangtag/clang-cl.patch.0 to liblangtag 0.6.1
    
    Change-Id: Idf75ffa042c4858ef9bea99d603adb691b295139

diff --git a/external/liblangtag/clang-cl.patch.0 b/external/liblangtag/clang-cl.patch.0
index cbc22a26..94348b6 100755
--- a/external/liblangtag/clang-cl.patch.0
+++ b/external/liblangtag/clang-cl.patch.0
@@ -18,3 +18,24 @@
  #  define LT_GNUC_NULL_TERMINATED		\
  	__attribute__((__sentinel__))
  #else /* !__GNUC__ */
+@@ -220,17 +220,17 @@
+  *
+  * See the GNU C documentation for more details.
+  */
+-#if __GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1)
++#if defined __GNUC__ && (__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 1))
+ #define LT_GNUC_DEPRECATED __attribute__((__deprecated__))
+ #else
+ #define LT_GNUC_DEPRECATED
+ #endif
+-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5)
++#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5))
+ #define LT_GNUC_DEPRECATED_FOR(f) __attribute__((deprecated("Use " #f " instead")))
+ #else
+ #define LT_GNUC_DEPRECATED_FOR(f) LT_GNUC_DEPRECATED
+ #endif
+-#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
++#if defined __GNUC__ && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6))
+ #define LT_GNUC_BEGIN_IGNORE_DEPRECATIONS	\
+ 	_Pragma ("GCC diagnostic push")		\
+ 	_Pragma ("GCC diagnostic ignored \"-Wdeprecated-declarations\"")


More information about the Libreoffice-commits mailing list