diff options
Diffstat (limited to '0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch')
| -rw-r--r-- | 0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch new file mode 100644 index 000000000000..5d9c11306888 --- /dev/null +++ b/0001-Recorder-includes-to-prevent-conflict-with-vsnprintf.patch @@ -0,0 +1,41 @@ +From 50c01edfba9e3aaf8c1713e04618de8020cf2a62 Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Sun, 25 Sep 2016 21:36:56 +0200 +Subject: [PATCH 1/3] Recorder includes to prevent conflict with vsnprintf + +Some files #include <dshow.h> +This is a C header which also #include's stdio.h which adds a #define vsnprintf +This #define vsnprint conflicts with QtCore/qstring.h so reorder the includes +a bit to prevent this situation +--- + src/multimedia/video/qvideosurfaceformat.h | 1 + + src/plugins/directshow/common/directshowglobal.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h +index 1d1990c7..8ddffa03 100644 +--- a/src/multimedia/video/qvideosurfaceformat.h ++++ b/src/multimedia/video/qvideosurfaceformat.h +@@ -44,6 +44,7 @@ + #include <QtCore/qpair.h> + #include <QtCore/qshareddata.h> + #include <QtCore/qsize.h> ++#include <QtCore/qstring.h> + #include <QtGui/qimage.h> + #include <QtMultimedia/qvideoframe.h> + +diff --git a/src/plugins/directshow/common/directshowglobal.h b/src/plugins/directshow/common/directshowglobal.h +index 12693e4f..f759a8f2 100644 +--- a/src/plugins/directshow/common/directshowglobal.h ++++ b/src/plugins/directshow/common/directshowglobal.h +@@ -43,6 +43,7 @@ + #include <dshow.h> + + #include <QtCore/qglobal.h> ++#include <QtCore/qstring.h> + #include <QtCore/qloggingcategory.h> + + QT_BEGIN_NAMESPACE +-- +2.28.0 + |