[poppler] qt5/src

[GitLab Mirror]

 qt5/src/poppler-version.h.in |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 01e963c4f89f47a883c27c597cdf7bf361e8f1ce
Author: Albert Astals Cid <aacid at kde.org>
Date:   Sat Jan 5 18:12:42 2019 +0100

    qt5: undefine major and minor since old glibc defined them

diff --git a/qt5/src/poppler-version.h.in b/qt5/src/poppler-version.h.in
index 9dd3c1e1..35645fe8 100644
--- a/qt5/src/poppler-version.h.in
+++ b/qt5/src/poppler-version.h.in
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2009, Pino Toscano <pino at kde.org>
- * Copyright (C) 2018, Albert Astals Cid <aacid at kde.org>
+ * Copyright (C) 2018, 2019, Albert Astals Cid <aacid at kde.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,6 +24,12 @@
 
 #include <QString>
 
+// glibc < 2.28 used to include sys/sysmacros.h
+// from sys/types.h and sysmacros.h defines minor and major so
+// undefine them. You may need to undefine them in your code too.
+#undef minor
+#undef major
+
 #define POPPLER_VERSION "@POPPLER_VERSION@"
 #define POPPLER_VERSION_MAJOR @POPPLER_MAJOR_VERSION@
 #define POPPLER_VERSION_MINOR @POPPLER_MINOR_VERSION@