From b5cc787d639909a04f9d605812b4ba84f74178c9 Mon Sep 17 00:00:00 2001 From: Nathan Mills <38995150+Quipyowert2@users.noreply.github.com> Date: Wed, 10 May 2023 12:44:55 -0700 Subject: [PATCH] Fix patch 03_headers_order. In PR #78, "snprintf & friends", I changed an #ifdef near the line that was moved in patch #3. That change fixes an error with Visual Studio 2015 and later, but caused the patch to fail to apply in GitHub Actions PR #77. --- debian/patches/03_headers_order.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/debian/patches/03_headers_order.patch b/debian/patches/03_headers_order.patch index 43e3b213f..0ac71564f 100644 --- a/debian/patches/03_headers_order.patch +++ b/debian/patches/03_headers_order.patch @@ -1,10 +1,10 @@ With gcc 4.4, compilation of libgag/src/TextStream.cpp fails with the error: 'class GAGCore::StreamBackend' has no member named 'getc'. Reordering #include's solves the problem. -Index: b/libgag/src/TextStream.cpp -=================================================================== ---- a/libgag/src/TextStream.cpp 2010-02-28 10:09:41.977348783 +0300 -+++ b/libgag/src/TextStream.cpp 2010-02-28 16:50:09.257348091 +0300 +diff --git a/libgag/src/TextStream.cpp b/libgag/src/TextStream.cpp +index 6847f18a..cc49181b 100644 +--- a/libgag/src/TextStream.cpp ++++ b/libgag/src/TextStream.cpp @@ -17,11 +17,11 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -15,6 +15,6 @@ Index: b/libgag/src/TextStream.cpp #include #include +#include - #ifdef WIN32 + #if defined(_MSC_VER) && _MSC_VER < 1900 #define snprintf _snprintf #define vsnprintf _vsnprintf