Fix GCC build

This commit is contained in:
Stas Degteff 2006-05-14 14:33:21 +00:00
parent 4df8f71029
commit 3b4c4492a8
24 changed files with 63 additions and 36 deletions

View File

@ -28,6 +28,7 @@
#include <fcntl.h>
#include <golded.h>
#include <gmoprot.h>
#include "geglob.h"
// FTS-0001 is FTS so leave it anyway :-)
#include <gmofido.h>
@ -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

View File

@ -518,6 +518,7 @@ int InstallFinish()
return 0;
}
return 0;
}
#endif

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -26,7 +26,6 @@
#include <golded.h>
// ------------------------------------------------------------------
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())

View File

@ -29,7 +29,7 @@
#include <list>
#include <gmo_msg.h>
#include <geall.h>
#include "gekeys.h"
// ------------------------------------------------------------------
// en_gswitches{} enumeration elements shoulds be complemented with

View File

@ -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);
};

View File

@ -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

View File

@ -30,15 +30,17 @@
#ifndef __GEGLOB_H
#define __GEGLOB_H
#ifdef HAS_ICONV
#include <iconv.h>
#endif
#include "gelang.h"
// Golded+ version information --------------------------------------
#include "golded3.h"
// ------------------------------------------------------------------
#ifdef HAS_ICONV
#include <iconv.h>
#endif
extern glog LOG;
extern gareafile* AFILE;

View File

@ -23,7 +23,8 @@
// ------------------------------------------------------------------
// Help Categories.
// ------------------------------------------------------------------
#ifndef __GEHELP_H
#define __GEHELP_H
// ------------------------------------------------------------------
// Help Categories
@ -131,3 +132,4 @@
// ------------------------------------------------------------------
#endif

View File

@ -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

View File

@ -23,8 +23,8 @@
// ------------------------------------------------------------------
// Language pointer structure.
// ------------------------------------------------------------------
#ifndef __GELANG_H
#define __GELANG_H
// ------------------------------------------------------------------
// Language pointer structure
@ -508,3 +508,4 @@ struct LangGed {
// ------------------------------------------------------------------
#endif

View File

@ -26,7 +26,6 @@
#include <golded.h>
// ------------------------------------------------------------------
GMsg* MenuMsgPtr;

View File

@ -33,7 +33,6 @@
#include <malloc.h>
#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];

View File

@ -26,7 +26,6 @@
#include <golded.h>
// ------------------------------------------------------------------
void GMnuAsk::AskInit(int __row, int __col, char* __title, int __help) {

View File

@ -23,8 +23,8 @@
// ------------------------------------------------------------------
// Derived menu classes.
// ------------------------------------------------------------------
#ifndef __GEMNUS_H
#define __GEMNUS_H
// ------------------------------------------------------------------
#include <gmnubase.h>
@ -315,3 +315,4 @@ public:
// ------------------------------------------------------------------
#endif

View File

@ -25,9 +25,10 @@
// ------------------------------------------------------------------
#ifndef __GEHDRS_H
#define __GEHDRS_H
#ifndef __GEPROT_H
#define __GEPROT_H
#include "gekeys.h"
// ------------------------------------------------------------------
// GCAREA prototypes

View File

@ -23,8 +23,8 @@
// ------------------------------------------------------------------
// QWK Implementation Structures and Classes.
// ------------------------------------------------------------------
#ifndef __GEQWKS_H
#define __GEQWKS_H
// ------------------------------------------------------------------
struct QwkCfg {
@ -115,3 +115,4 @@ public:
// ------------------------------------------------------------------
#endif

View File

@ -23,6 +23,8 @@
// ------------------------------------------------------------------
// Advanced search functions.
// ------------------------------------------------------------------
#ifndef __GESRCH_H
#define __GESRCH_H
#include <gstrarr.h>
#include <gsrchmgr.h>
@ -74,3 +76,4 @@ public:
// ------------------------------------------------------------------
#endif

View File

@ -23,6 +23,8 @@
// ------------------------------------------------------------------
// GEUSRBSE header file.
// ------------------------------------------------------------------
#ifndef __GEUSRBSE_H
#define __GEUSRBSE_H
#include <gmnubase.h>
#include <gwinput.h>
@ -195,3 +197,4 @@ public:
// ------------------------------------------------------------------
#endif

View File

@ -23,9 +23,11 @@
// ------------------------------------------------------------------
// Message viewer classes.
// ------------------------------------------------------------------
#ifndef __GEVIEW_H
#define __GEVIEW_H
#include <gwindow.h>
#include "gmarea.h"
// ------------------------------------------------------------------
@ -133,3 +135,4 @@ public:
// ------------------------------------------------------------------
#endif

View File

@ -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

View File

@ -95,6 +95,7 @@
#include <geprot.h>
#include <gemnus.h>
#include <gefn.h>
#include "gehelp.h"
// ------------------------------------------------------------------