diff -ur golded+-orig/golded3/gealst.cpp golded+/golded3/gealst.cpp
--- golded+-orig/golded3/gealst.cpp	2003-12-12 15:47:58 +0300
+++ golded+/golded3/gealst.cpp	2005-01-23 19:58:23 +0300
@@ -531,7 +531,7 @@
   if(not aborted)
     AL.mask = (byte)index;
 
-};
+}
 
 
 void AreaList::Select_Mask() {
diff -ur golded+-orig/golded3/gearea.cpp golded+/golded3/gearea.cpp
--- golded+-orig/golded3/gearea.cpp	2003-06-13 00:19:06 +0400
+++ golded+/golded3/gearea.cpp	2005-01-23 19:58:23 +0300
@@ -85,7 +85,7 @@
 
   area_fuzidx = 0;
 
-};
+}
 
 
 //  ------------------------------------------------------------------
diff -ur golded+-orig/golded3/gefile.cpp golded+/golded3/gefile.cpp
--- golded+-orig/golded3/gefile.cpp	2001-12-25 11:09:41 +0300
+++ golded+/golded3/gefile.cpp	2005-01-23 20:01:56 +0300
@@ -357,7 +357,7 @@
 
   run_picker();
 
-};
+}
 
 
 
diff -ur golded+-orig/golded3/geline.cpp golded+/golded3/geline.cpp
--- golded+-orig/golded3/geline.cpp	2003-12-12 15:47:59 +0300
+++ golded+/golded3/geline.cpp	2005-01-23 19:58:23 +0300
@@ -2929,7 +2929,7 @@
 
 //  ------------------------------------------------------------------
 
-Line* AddLine(Line* line, char* buf, int where) {
+Line* AddLine(Line* line, const char* buf, int where) {
 
   Line* newline = new Line(buf);
   throw_xnew(newline);
@@ -2942,7 +2942,7 @@
 
 //  ------------------------------------------------------------------
 
-Line* AddLine(Line* line, char* buf) {
+Line* AddLine(Line* line, const char* buf) {
 
   return AddLine(line, buf, DIR_BELOW);
 }
diff -ur golded+-orig/golded3/gemnus.cpp golded+/golded3/gemnus.cpp
--- golded+-orig/golded3/gemnus.cpp	2003-06-13 00:19:15 +0400
+++ golded+/golded3/gemnus.cpp	2005-01-23 20:02:36 +0300
@@ -408,7 +408,7 @@
   vcurshow();
 
   return finaltag - TAG_TEXT;
-};
+}
 
 
 //  ------------------------------------------------------------------
diff -ur golded+-orig/golded3/geusrbse.cpp golded+/golded3/geusrbse.cpp
--- golded+-orig/golded3/geusrbse.cpp	2003-12-28 02:45:44 +0300
+++ golded+/golded3/geusrbse.cpp	2005-01-23 20:03:34 +0300
@@ -235,9 +235,9 @@
 //  ------------------------------------------------------------------
 
 addressbook_form::~addressbook_form() { }
-addressbook_form::addressbook_form(gwindow& w) : gwinput2(w) { };
-void addressbook_form::after() { gwinput2::after(); };
-void addressbook_form::before() { gwinput2::before(); };
+addressbook_form::addressbook_form(gwindow& w) : gwinput2(w) { }
+void addressbook_form::after() { gwinput2::after(); }
+void addressbook_form::before() { gwinput2::before(); }
 
 
 //  ------------------------------------------------------------------
diff -ur golded+-orig/goldlib/gall/gdbgtrk.h golded+/goldlib/gall/gdbgtrk.h
--- golded+-orig/goldlib/gall/gdbgtrk.h	2000-02-25 13:11:57 +0300
+++ golded+/goldlib/gall/gdbgtrk.h	2005-01-23 20:06:15 +0300
@@ -57,7 +57,7 @@
 
 #if defined(GFTRK_ENABLE)
 #ifdef __GNUC__
-#define GFTRK(t)  if(__gftrk) __gftrk_track(t ? __PRETTY_FUNCTION__ : t);
+#define GFTRK(t)  if(__gftrk) __gftrk_track((t != NULL) ? __PRETTY_FUNCTION__ : (t));
 #else
 #define GFTRK(t)  if(__gftrk) __gftrk_track(t);
 #endif
diff -ur golded+-orig/goldlib/gall/gfilutil.h golded+/goldlib/gall/gfilutil.h
--- golded+-orig/goldlib/gall/gfilutil.h	2003-04-20 21:41:35 +0400
+++ golded+/goldlib/gall/gfilutil.h	2005-01-23 19:58:23 +0300
@@ -191,7 +191,7 @@
 int strschg_environ(std::string& s);
 
 char* MapPath(char* map, bool reverse = false);
-inline char* ReMapPath(char* map) { return MapPath(map, true); };
+inline char* ReMapPath(char* map) { return MapPath(map, true); }
 
 inline long lseekset(int fh, long offset) { return lseek(fh, offset, SEEK_SET); }
 inline long lseekset(int fh, long record, long recordsize) { return lseek(fh, record*recordsize, SEEK_SET); }
diff -ur golded+-orig/goldlib/gmb3/gmo_msg.h golded+/goldlib/gmb3/gmo_msg.h
--- golded+-orig/goldlib/gmb3/gmo_msg.h	2001-07-17 00:35:42 +0400
+++ golded+/goldlib/gmb3/gmo_msg.h	2005-01-23 19:58:23 +0300
@@ -171,7 +171,7 @@
 //  ------------------------------------------------------------------
 
 Line* AddLineF(Line*& line, const char* format, ...) __attribute__ ((format (printf, 2, 3)));
-Line* AddLine(Line* line, char* buf);
+Line* AddLine(Line* line, const char* buf);
 Line* AddHexdump(Line*& line, void* data, size_t datalen);
 
 
diff -ur golded+-orig/goldlib/uulib/uunconc.c golded+/goldlib/uulib/uunconc.c
--- golded+-orig/goldlib/uulib/uunconc.c	2004-10-05 21:17:24 +0400
+++ golded+/goldlib/uulib/uunconc.c	2005-01-23 19:58:23 +0300
@@ -1146,7 +1146,7 @@
       }
 
       if (vflag == method) {
-//	if (tf) {
+/*	if (tf) { */
 	if (tf || (method == UU_ENCODED || method == XX_ENCODED)) {
 	  count  = UUDecodeLine (line, oline, method);
 	  if (method == YENC_ENCODED) {