Skip to content

Commit de944f6

Browse files
committed
Fix patch 03_headers_order.
In PR Globulation2#96, "snprintf & friends", I changed an ifdef near the line that was moved in patch Globulation2#3. That fixed an error with Visual Studio 2015 and later, but caused that patch to fail to apply in GitHub Actions PR Globulation2#77.
1 parent d9e683c commit de944f6

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
With gcc 4.4, compilation of libgag/src/TextStream.cpp fails with the error:
22
'class GAGCore::StreamBackend' has no member named 'getc'. Reordering
33
#include's solves the problem.
4-
Index: b/libgag/src/TextStream.cpp
5-
===================================================================
6-
--- a/libgag/src/TextStream.cpp 2010-02-28 10:09:41.977348783 +0300
7-
+++ b/libgag/src/TextStream.cpp 2010-02-28 16:50:09.257348091 +0300
4+
diff --git a/libgag/src/TextStream.cpp b/libgag/src/TextStream.cpp
5+
index 6847f18a..cc49181b 100644
6+
--- a/libgag/src/TextStream.cpp
7+
+++ b/libgag/src/TextStream.cpp
88
@@ -17,11 +17,11 @@
99
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
1010
*/
@@ -15,6 +15,6 @@ Index: b/libgag/src/TextStream.cpp
1515
#include <iostream>
1616
#include <stack>
1717
+#include <TextStream.h>
18-
#ifdef WIN32
18+
#if defined(_MSC_VER) && _MSC_VER < 1900
1919
#define snprintf _snprintf
2020
#define vsnprintf _vsnprintf

0 commit comments

Comments
 (0)