From 4ab601e382bc03d3687b9bb3eb0e38677bc873a9 Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Tue, 1 Nov 2005 20:11:49 +0000
Subject: [PATCH] Fix GCC build

---
 golded3/gelmsg.cpp     | 7 +++++++
 goldlib/uulib/Makefile | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/golded3/gelmsg.cpp b/golded3/gelmsg.cpp
index 58d3121..bb9886b 100644
--- a/golded3/gelmsg.cpp
+++ b/golded3/gelmsg.cpp
@@ -119,7 +119,14 @@ int Area::LoadMsg(GMsg* msg, uint32_t msgno, int margin, int mode) {
         Latin2Local(msg->re);
 
       for (Line *ln = msg->lin; ln; ln = ln->next)
+#ifdef _MSC_VER
         Latin2Local(ln->txt.begin());
+#else
+      { char*str=strdup(ln->txt.data());
+        Latin2Local(str);
+        ln->txt.assign(str);
+      }
+#endif
     }
 
     return true;
diff --git a/goldlib/uulib/Makefile b/goldlib/uulib/Makefile
index c512042..2e417d5 100644
--- a/goldlib/uulib/Makefile
+++ b/goldlib/uulib/Makefile
@@ -5,7 +5,7 @@ PATCH=15
 
 TOP=../..
 TARGET=uulib
-INCS=-I$(TOP)/goldlib/uulib
+INCS=-I$(TOP)/goldlib/uulib -I$(TOP)/goldlib/gall
 CFLAGS=-DHAVE_CONFIG_H -DVERSION=\"$(VERSION)\" -DPATCH=\"$(PATCH)\"
 
 include $(TOP)/GNUmakef.inc