From 3b4c4492a83148340382ff284d681bc5490ad7e3 Mon Sep 17 00:00:00 2001 From: Stas Degteff Date: Sun, 14 May 2006 14:33:21 +0000 Subject: [PATCH] Fix GCC build --- golded3/gcalst.cpp | 9 +++++---- golded3/gccfgg.cpp | 1 + golded3/gccfgg.h | 4 +++- golded3/gckeys.h | 5 +++-- golded3/gclang.h | 5 +++-- golded3/gcmisc.cpp | 3 +-- golded3/gecfgg.h | 2 +- golded3/gectnr.h | 6 +++--- golded3/geedit.h | 3 +++ golded3/geglob.h | 10 ++++++---- golded3/gehelp.h | 4 +++- golded3/gekeys.h | 4 ++++ golded3/gelang.h | 5 +++-- golded3/gemenu.cpp | 1 - golded3/gemlst.cpp | 3 +-- golded3/gemnus.cpp | 1 - golded3/gemnus.h | 5 +++-- golded3/geprot.h | 5 +++-- golded3/geqwks.h | 5 +++-- golded3/gesrch.h | 3 +++ golded3/geusrbse.h | 3 +++ golded3/geview.h | 5 ++++- golded3/gmarea.h | 6 +++--- golded3/golded.h | 1 + 24 files changed, 63 insertions(+), 36 deletions(-) diff --git a/golded3/gcalst.cpp b/golded3/gcalst.cpp index d82bbe0..35c8674 100644 --- a/golded3/gcalst.cpp +++ b/golded3/gcalst.cpp @@ -28,6 +28,7 @@ #include #include #include +#include "geglob.h" // FTS-0001 is FTS so leave it anyway :-) #include @@ -195,7 +196,7 @@ void AreaList::ReadGoldLast() { word GOLDLAST_VER; ggoldlast entry; - + gfile fp(AddPath(CFG->goldpath, CFG->goldlast), "rb", CFG->sharemode); if (fp.isopen()) { @@ -210,7 +211,7 @@ void AreaList::ReadGoldLast() while (fp.Fread(&entry, sizeof(entry))) { bool found = false; - + for(area_iterator ap = idx.begin(); ap != idx.end(); ap++) { if(strCrc32((*ap)->echoid(), false) == entry.crcechoid) { @@ -225,12 +226,12 @@ void AreaList::ReadGoldLast() (*ap)->Mark.Load(fp); (*ap)->PMrk.Load(fp); - + found = true; break; } } - + if (not found) { // skip stored message marks diff --git a/golded3/gccfgg.cpp b/golded3/gccfgg.cpp index efa9464..5dffae8 100644 --- a/golded3/gccfgg.cpp +++ b/golded3/gccfgg.cpp @@ -518,6 +518,7 @@ int InstallFinish() return 0; } + return 0; } #endif diff --git a/golded3/gccfgg.h b/golded3/gccfgg.h index 05ebe6b..19d4066 100644 --- a/golded3/gccfgg.h +++ b/golded3/gccfgg.h @@ -23,7 +23,8 @@ // ------------------------------------------------------------------ // CRC16 values for all standard configuration keywords. // ------------------------------------------------------------------ - +#ifndef __GCCFGG_H +#define __GCCFGG_H // ------------------------------------------------------------------ @@ -429,3 +430,4 @@ const word CRC_LAST_CRC = 0xFFFF; // ------------------------------------------------------------------ +#endif diff --git a/golded3/gckeys.h b/golded3/gckeys.h index 5daa04b..12acdeb 100644 --- a/golded3/gckeys.h +++ b/golded3/gckeys.h @@ -23,8 +23,8 @@ // ------------------------------------------------------------------ // CRC16 value for keyboard definitions. // ------------------------------------------------------------------ - - +#ifndef __GCKEYS_H +#define __GCKEYS_H // ------------------------------------------------------------------ // CRC16 value for keyboard definitions @@ -557,3 +557,4 @@ const word CRC_K_SDOWN = 0xF0FB; // ------------------------------------------------------------------ +#endif diff --git a/golded3/gclang.h b/golded3/gclang.h index 6a490bc..71285d1 100644 --- a/golded3/gclang.h +++ b/golded3/gclang.h @@ -23,8 +23,8 @@ // ------------------------------------------------------------------ // CRC values for language items. // ------------------------------------------------------------------ - - +#ifndef __GCLANG_H +#define __GCLANG_H // ------------------------------------------------------------------ // CRC values for language items @@ -531,3 +531,4 @@ const word CRC_LAST_CRC = 0xFFFF; // ------------------------------------------------------------------ +#endif diff --git a/golded3/gcmisc.cpp b/golded3/gcmisc.cpp index 1df3c5f..d3950c4 100644 --- a/golded3/gcmisc.cpp +++ b/golded3/gcmisc.cpp @@ -26,7 +26,6 @@ #include - // ------------------------------------------------------------------ int ReadHelpCfg(int force) { @@ -637,7 +636,7 @@ void ReadXlatTables() ChsTable.t[n][0] = 1; ChsTable.t[n][1] = (uint8_t)n; // The character } - + strcpy(buf, AddPath(CFG->xlatpath, xlt->mapfile)); gfile ifp(buf, "rb", CFG->sharemode); if (ifp.isopen()) diff --git a/golded3/gecfgg.h b/golded3/gecfgg.h index 3666d23..bae7141 100644 --- a/golded3/gecfgg.h +++ b/golded3/gecfgg.h @@ -29,7 +29,7 @@ #include #include #include - +#include "gekeys.h" // ------------------------------------------------------------------ // en_gswitches{} enumeration elements shoulds be complemented with diff --git a/golded3/gectnr.h b/golded3/gectnr.h index 8d91808..876cf2f 100644 --- a/golded3/gectnr.h +++ b/golded3/gectnr.h @@ -24,8 +24,8 @@ // Container class. // ------------------------------------------------------------------ -#ifndef __gectnr_h -#define __gectnr_h +#ifndef __GECTNR_H +#define __GECTNR_H // ------------------------------------------------------------------ @@ -36,7 +36,7 @@ class Container { public: virtual ~Container() { } - + void StyleCodeHighlight(const char* text, int row, int col, bool dohide, vattr color); }; diff --git a/golded3/geedit.h b/golded3/geedit.h index a18ad8c..2e235ea 100644 --- a/golded3/geedit.h +++ b/golded3/geedit.h @@ -23,6 +23,8 @@ // ------------------------------------------------------------------ // The Internal Editor (IE). // ------------------------------------------------------------------ +#ifndef __GEEDIT_H +#define __GEEDIT_H #ifdef __GNUG__ #pragma interface "geedit.h" @@ -441,3 +443,4 @@ inline void IEclass::killpastebuf() { Edit__killpastebuf(); } // ------------------------------------------------------------------ +#endif diff --git a/golded3/geglob.h b/golded3/geglob.h index a20b0e9..a435c7d 100644 --- a/golded3/geglob.h +++ b/golded3/geglob.h @@ -30,15 +30,17 @@ #ifndef __GEGLOB_H #define __GEGLOB_H +#ifdef HAS_ICONV + #include +#endif + +#include "gelang.h" + // Golded+ version information -------------------------------------- #include "golded3.h" // ------------------------------------------------------------------ -#ifdef HAS_ICONV - #include -#endif - extern glog LOG; extern gareafile* AFILE; diff --git a/golded3/gehelp.h b/golded3/gehelp.h index 93afd5a..5eb5f43 100644 --- a/golded3/gehelp.h +++ b/golded3/gehelp.h @@ -23,7 +23,8 @@ // ------------------------------------------------------------------ // Help Categories. // ------------------------------------------------------------------ - +#ifndef __GEHELP_H +#define __GEHELP_H // ------------------------------------------------------------------ // Help Categories @@ -131,3 +132,4 @@ // ------------------------------------------------------------------ +#endif diff --git a/golded3/gekeys.h b/golded3/gekeys.h index 824383f..8831f51 100644 --- a/golded3/gekeys.h +++ b/golded3/gekeys.h @@ -44,6 +44,9 @@ // // ------------------------------------------------------------------ +#ifndef __GEKEYS_H +#define __GEKEYS_H + const gkey KK_Auto = 0xFD00; const gkey KK_Macro = 0xFE00; const gkey KK_AreaMacro = 0xFE01; @@ -470,3 +473,4 @@ struct tglobalkey { // ------------------------------------------------------------------ +#endif diff --git a/golded3/gelang.h b/golded3/gelang.h index bf300bd..998f3ba 100644 --- a/golded3/gelang.h +++ b/golded3/gelang.h @@ -23,8 +23,8 @@ // ------------------------------------------------------------------ // Language pointer structure. // ------------------------------------------------------------------ - - +#ifndef __GELANG_H +#define __GELANG_H // ------------------------------------------------------------------ // Language pointer structure @@ -508,3 +508,4 @@ struct LangGed { // ------------------------------------------------------------------ +#endif diff --git a/golded3/gemenu.cpp b/golded3/gemenu.cpp index e28bc7d..90f7435 100644 --- a/golded3/gemenu.cpp +++ b/golded3/gemenu.cpp @@ -26,7 +26,6 @@ #include - // ------------------------------------------------------------------ GMsg* MenuMsgPtr; diff --git a/golded3/gemlst.cpp b/golded3/gemlst.cpp index e90ee3c..c88dc18 100644 --- a/golded3/gemlst.cpp +++ b/golded3/gemlst.cpp @@ -33,7 +33,6 @@ #include #endif - // ------------------------------------------------------------------ extern GMsg* reader_msg; @@ -1313,7 +1312,7 @@ bool GThreadlist::GoNextUnread(bool reader) if (size > 1) { size_t idx; - + for (idx = index + 1; idx < size; idx++) { t = list[idx]; diff --git a/golded3/gemnus.cpp b/golded3/gemnus.cpp index dfb4de1..f8e851e 100644 --- a/golded3/gemnus.cpp +++ b/golded3/gemnus.cpp @@ -26,7 +26,6 @@ #include - // ------------------------------------------------------------------ void GMnuAsk::AskInit(int __row, int __col, char* __title, int __help) { diff --git a/golded3/gemnus.h b/golded3/gemnus.h index f30bbad..7903d10 100644 --- a/golded3/gemnus.h +++ b/golded3/gemnus.h @@ -23,8 +23,8 @@ // ------------------------------------------------------------------ // Derived menu classes. // ------------------------------------------------------------------ - - +#ifndef __GEMNUS_H +#define __GEMNUS_H // ------------------------------------------------------------------ #include @@ -315,3 +315,4 @@ public: // ------------------------------------------------------------------ +#endif diff --git a/golded3/geprot.h b/golded3/geprot.h index d709ecc..62eef32 100644 --- a/golded3/geprot.h +++ b/golded3/geprot.h @@ -25,9 +25,10 @@ // ------------------------------------------------------------------ -#ifndef __GEHDRS_H -#define __GEHDRS_H +#ifndef __GEPROT_H +#define __GEPROT_H +#include "gekeys.h" // ------------------------------------------------------------------ // GCAREA prototypes diff --git a/golded3/geqwks.h b/golded3/geqwks.h index 86f4786..7a702fe 100644 --- a/golded3/geqwks.h +++ b/golded3/geqwks.h @@ -23,8 +23,8 @@ // ------------------------------------------------------------------ // QWK Implementation Structures and Classes. // ------------------------------------------------------------------ - - +#ifndef __GEQWKS_H +#define __GEQWKS_H // ------------------------------------------------------------------ struct QwkCfg { @@ -115,3 +115,4 @@ public: // ------------------------------------------------------------------ +#endif diff --git a/golded3/gesrch.h b/golded3/gesrch.h index d707d45..b9f7c2c 100644 --- a/golded3/gesrch.h +++ b/golded3/gesrch.h @@ -23,6 +23,8 @@ // ------------------------------------------------------------------ // Advanced search functions. // ------------------------------------------------------------------ +#ifndef __GESRCH_H +#define __GESRCH_H #include #include @@ -74,3 +76,4 @@ public: // ------------------------------------------------------------------ +#endif diff --git a/golded3/geusrbse.h b/golded3/geusrbse.h index 7d463d5..4a23e85 100644 --- a/golded3/geusrbse.h +++ b/golded3/geusrbse.h @@ -23,6 +23,8 @@ // ------------------------------------------------------------------ // GEUSRBSE header file. // ------------------------------------------------------------------ +#ifndef __GEUSRBSE_H +#define __GEUSRBSE_H #include #include @@ -195,3 +197,4 @@ public: // ------------------------------------------------------------------ +#endif diff --git a/golded3/geview.h b/golded3/geview.h index b5a801e..4224559 100644 --- a/golded3/geview.h +++ b/golded3/geview.h @@ -23,9 +23,11 @@ // ------------------------------------------------------------------ // Message viewer classes. // ------------------------------------------------------------------ +#ifndef __GEVIEW_H +#define __GEVIEW_H #include - +#include "gmarea.h" // ------------------------------------------------------------------ @@ -133,3 +135,4 @@ public: // ------------------------------------------------------------------ +#endif diff --git a/golded3/gmarea.h b/golded3/gmarea.h index 39f28e0..fc36431 100644 --- a/golded3/gmarea.h +++ b/golded3/gmarea.h @@ -24,8 +24,8 @@ // Area structures and classes. // ------------------------------------------------------------------ -#ifndef __gmoarea_h -#define __gmoarea_h +#ifndef __GMAREA_H +#define __GMAREA_H // ------------------------------------------------------------------ @@ -718,4 +718,4 @@ public: // ------------------------------------------------------------------ -#endif // __gmoarea_h +#endif diff --git a/golded3/golded.h b/golded3/golded.h index df40ad3..55532b5 100644 --- a/golded3/golded.h +++ b/golded3/golded.h @@ -95,6 +95,7 @@ #include #include #include +#include "gehelp.h" // ------------------------------------------------------------------