From 12c860a28c86fd64a13b09534f6e009de22b64ef Mon Sep 17 00:00:00 2001
From: Stas Degteff <stas_degteff@users.sourceforge.net>
Date: Fri, 26 Aug 2005 23:12:29 +0000
Subject: [PATCH] Fix type definitions

---
 goldlib/gcfg/gs_max3.h |  2 +-
 goldlib/gcfg/gxhpt.cpp | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/goldlib/gcfg/gs_max3.h b/goldlib/gcfg/gs_max3.h
index 06e3988..a3f6336 100644
--- a/goldlib/gcfg/gs_max3.h
+++ b/goldlib/gcfg/gs_max3.h
@@ -554,7 +554,7 @@ struct _ovride {
 #define MA_SHARED   (MA_ECHO | MA_CONF)
 
 
-typedef struct _msgarea {
+struct _msgarea {
 
   word cbArea;          /* Length of THIS INDIVIDUAL RECORD                0*/
   word num_override;    /* Number of overrides following this record       2*/
diff --git a/goldlib/gcfg/gxhpt.cpp b/goldlib/gcfg/gxhpt.cpp
index bbea70c..730f24c 100644
--- a/goldlib/gcfg/gxhpt.cpp
+++ b/goldlib/gcfg/gxhpt.cpp
@@ -34,7 +34,7 @@
 
 //  ------------------------------------------------------------------
 
-static bool comment_char = '#';
+static char comment_char = '#';
 
 //  ------------------------------------------------------------------
 
@@ -91,7 +91,7 @@ bool gareafile::ReadHPTLine(FILE* f, std::string* s, bool add, int state) {
   else
     *s = p;
 
-  return true;  
+  return true;
 }
 
 
@@ -285,7 +285,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
               else {
 
                 char *opt = key + 1;
-    
+
                 if(strieql(opt, "p") or strieql(opt, "$m")
                    or strieql(opt, "lr") or strieql(opt, "lw")
                    or strieql(opt, "dupeCheck") or strieql(opt, "dupehistory")
@@ -293,11 +293,11 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
                    or strieql(opt, "l") or strieql(opt, "fperm")
                    or strieql(opt, "fowner") or strnieql(opt, "sbadd(", 6)
                    or strnieql(opt, "sbign(", 6)) {
-    
+
                   gettok(&key, &val);
                 }
                 else if(strieql(opt, "a")) {
-    
+
                   gettok(&key, &val);
                   CfgAddress(key);
                   aa.aka.set(key);
@@ -313,16 +313,16 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
                         or strieql(opt, "$") or strieql(opt, "0")) {
                 }
                 else if(strieql(opt, "g")) {
-    
+
                   gettok(&key, &val);
-    
+
                   if(isdigit(*key))
                     aa.groupid = 0x8000+atoi(key);
                   else if(isalpha(*key))
                     aa.groupid = toupper(*key);
                 }
                 else if (strieql(opt, "d")) {
-    
+
                   gettok(&key, &val);
                   aa.setdesc(key);
                 }
@@ -335,7 +335,7 @@ void gareafile::ReadHPTFile(char* path, char* file, char* origin, int group) {
 
               gettok(&key, &val);
             }
-                                
+
             aa.setorigin(origin);
 
             switch(aa.type) {