bbs/deb-goldedplus
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Apply changes to MS Visual C build. Patch from Ianos Gnatiuc 2:469/335.155

Browse Source
This commit is contained in:
Stas Degteff
2005-08-26 23:14:24 +00:00
parent 12c860a28c
commit 4a77b5a598
30 changed files with 273 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
golded3/gccfgg0.cpp
View File

@@ -637,7 +637,7 @@ End:
return true;
}
// ------------------------------------------------------------------
@@ -783,7 +783,15 @@ int ReadCfg(const char* cfgfile, int ignoreunknown) {
// Tell the world what we found
if(veryverbose)
std::cout << " " << (cfgignore ? '-' : '+') << std::setw(4) << std::setfill('0') << line << std::setfill(' ') << ": " << key << " " << val << std::endl;
{
#if defined(_MSC_VER)
char buff[256];
sprintf(buff, " %c %04d: %s %s\n", cfgignore ? '-' : '+', line, key, val);
std::cout << buff;
#else
std::cout << " " << (cfgignore ? '-' : '+') << std::setw(4) << std::setfill('0') << line << std::setfill(' ') << ": " << key << " " << val << std::endl;
#endif
}
// Call switch function to act on the key
if(not cfgignore) {

14
golded3/gckeys.cpp
View File

@@ -350,11 +350,11 @@ CmdKey DefaultKeyset[] = {
{ Key_A_1 , KK_HeaderToggleReserved , KT_H },
{ Key_A_P , KK_HeaderTogglePvt , KT_H },
{ Key_A_S , KK_HeaderToggleSent , KT_H },
{ 0xFFFF , 0xFFFF , 0xFF }
};
// ------------------------------------------------------------------
// must be sorted by crc_token
@@ -889,7 +889,7 @@ static gkey SwitchKeyDefs(word crc, int* type) {
*type = globalkeys[middle].keytype;
return globalkeys[middle].keyval;
}
} while(left <= right);
return 0;
@@ -964,7 +964,8 @@ static void SetKeybDefaults() {
// ------------------------------------------------------------------
bool CmdKeyCmp(CmdKey a, CmdKey b) {
//bool CmdKeyCmp(CmdKey a, CmdKey b) {
bool operator<(CmdKey &a, CmdKey &b) {
int cmp = CmpV(a.type, b.type);
if(cmp != 0)
@@ -1126,7 +1127,8 @@ int ReadKeysCfg(int force) {
SetKeybDefaults();
// Prepare keyboard and macro tables for binary searching
CFG->cmdkey.sort(CmdKeyCmp);
// CFG->cmdkey.sort(CmdKeyCmp);
CFG->cmdkey.sort();
// Count keys
std::list<CmdKey>::iterator ck = CFG->cmdkey.begin();
@@ -1162,7 +1164,7 @@ int ReadKeysCfg(int force) {
}
}
}
return true;
}

11
golded3/gealst.cpp
View File

@@ -24,6 +24,9 @@
// Arealist functions.
// ------------------------------------------------------------------
#if defined(__MINGW32__) || defined(_MSC_VER)
#include <malloc.h>
#endif
#include <algorithm>
#include <golded.h>
@@ -84,7 +87,7 @@ int compare_groups(int _ga, int _gb)
else
g++;
}
if(gap == NULL) {
if(gbp != NULL)
return 1;
@@ -471,7 +474,11 @@ void SelMaskPick::close() {
void SelMaskPick::print_line(uint idx, uint pos, bool isbar) {
__extension__ char buf[DESC_LEN+3];
#if defined(__WIN32__)
char *buf = (char*)alloca(DESC_LEN+3);
#else
__extension__ char buf[DESC_LEN+3];
#endif
*buf = ' '; strxcpy(buf+1, AL.alistselections[idx], DESC_LEN);
window.printns(pos, 0, isbar ? sattr : wattr, buf, xlen);

8
golded3/gearea.cpp
View File

@@ -419,8 +419,8 @@ void GPickArealist::print_line(uint idx, uint pos, bool isbar) {
int sep_pos = (desc_pos != -1) ? desc_pos : echoid_pos;
for(int c = 0; c < sep_pos; c++)
vbuf[c] = _box_table(btype, 1);
{for(int c = 0; c < sep_pos; c++)
vbuf[c] = _box_table(btype, 1);}
vbuf[sep_pos] = NUL;
wprintvs(pos, 0, battr|ACSET, vbuf);
wprints(pos, sep_pos, tattr, area->desc());
@@ -428,8 +428,8 @@ void GPickArealist::print_line(uint idx, uint pos, bool isbar) {
int l = strlen(area->desc());
int n = MAXCOL-2-sep_pos-l;
for(int c = 0; c < n; c++)
vbuf[c] = _box_table(btype,1);
{for(int c = 0; c < n; c++)
vbuf[c] = _box_table(btype,1);}
vbuf[n] = NUL;
wprintvs(pos, sep_pos+l, battr|ACSET, vbuf);
}

6
golded3/gectrl.cpp
View File

@@ -163,7 +163,7 @@ char* mime_header_encode(char* dest, const char* source, GMsg* msg) {
lp = s + strlen(s);
while((lp>s) and in_range(lp[-1], ' ', '\x7F'))
while((lp>s) and in_range(char(lp[-1]), char(' '), char('\x7F')))
lp--;
for(const char* ptr = s; *ptr and (ptr<lp); ptr++) {
@@ -231,7 +231,7 @@ void DoKludges(int mode, GMsg* msg, int kludges) {
char* buf = (char*)throw_malloc(4096);
char* buf2 = (char*)throw_malloc(1024);
Line* line;
// Insert empty line at the top for practical purposes
line = new Line();
@@ -747,7 +747,7 @@ void DoTearorig(int mode, GMsg* msg) {
else
line = line->next;
}
// Make sure there is a blank line at the bottom, just before the tearline
// Unless the line is a tagline (..., ___ etc).
line = LastLine(msg->lin);

13
golded3/geedit.h
View File

@@ -136,6 +136,7 @@ public:
text_item(uint __col, uint __len) : col(__col), len(__len) { }
void* operator new(size_t size, uint text_len = 0) { return malloc(sizeof(text_item) + size + text_len); }
void operator delete(void* ptr) { free(ptr); }
void operator delete(void* ptr, uint) { free(ptr); }
};
// ----------------------------------------------------------------
@@ -159,20 +160,20 @@ struct col_rec {
class UndoItem {
static UndoItem** last_item;
friend class UndoStack;
public:
UndoItem* prev;
Line* line; // Cursor line
col_rec col; // Cursor column
uint pcol; // After undo move cursor to pcol, prow
uint prow; //
uint action; // Undo action
data_rec data; // Undo data
UndoItem() { this->prev = *last_item; }
~UndoItem() { *last_item = this->prev; }
};
@@ -194,7 +195,7 @@ class UndoStack {
uint& thisrow;
Line*& currline;
bool& undo_ready;
public:
UndoItem* last_item;
@@ -335,7 +336,7 @@ public:
IEclass(int __scol, int __ecol, int __srow, int __erow, int __border);
~IEclass();
// ----------------------------------------------------------------
// Function to start the editor

14
golded3/geedit2.cpp
View File

@@ -24,6 +24,10 @@
// The Internal Editor (IE), part 2.
// ------------------------------------------------------------------
#if defined(__MINGW32__) || defined(_MSC_VER)
#include <malloc.h>
#endif
#include <golded.h>
#include <geedit.h>
#include <gutlcode.h>
@@ -274,7 +278,7 @@ void IEclass::DelRtWord() {
GFTRK(NULL);
return;
}
int _ptr, _ptr2;
_ptr = _ptr2 = col;
@@ -391,7 +395,7 @@ void IEclass::GoBotLine() {
Line *_oldcurrline = currline;
int _oldrow = row;
while((row < maxrow) and currline->next) {
currline = currline->next;
thisrow++;
@@ -569,7 +573,7 @@ void IEclass::BlockCopy() {
// Continue with the next line
_firstcopyline = _firstcopyline->next;
}
}
selecting = NO;
blockcol = -1;
@@ -1086,7 +1090,11 @@ void IEclass::editimport(Line* __line, char* __filename, bool imptxt) {
else {
int tabsz = CFG->disptabsize ? CFG->disptabsize : 1;
#if defined(_MSC_VER) || defined(__MINGW32__)
char *spaces = (char*)alloca(tabsz+1);
#else
__extension__ char spaces[tabsz+1];
#endif
memset(spaces, ' ', tabsz);
spaces[tabsz] = NUL;
int level = LoadCharset(AA->Xlatimport(), CFG->xlatlocalset);

10
golded3/geedit3.cpp
View File

@@ -24,6 +24,10 @@
// OS/2 clipboard to/from edit paste buffer.
// ------------------------------------------------------------------
#if defined(__MINGW32__) || defined(_MSC_VER)
#include <malloc.h>
#endif
#include <golded.h>
#include <geedit.h>
#include <gutlclip.h>
@@ -36,7 +40,11 @@ void IEclass::Clip2Buf() {
return;
int tabsz = CFG->disptabsize ? CFG->disptabsize : 1;
#if defined(__MINGW32__) || defined(_MSC_VER)
char *spaces = (char*)alloca(tabsz+1);
#else
__extension__ char spaces[tabsz+1];
#endif
memset(spaces, ' ', tabsz);
spaces[tabsz] = NUL;
@@ -46,7 +54,7 @@ void IEclass::Clip2Buf() {
Line *__line = NULL;
Undo->undo_enabled = NO;
// Read paragraphs
while(clipbrd.read(buf, EDIT_PARABUFLEN-6)) {

20
golded3/gefile.cpp
View File

@@ -24,6 +24,10 @@
// File handling.
// ------------------------------------------------------------------
#if defined(__MINGW32__) || defined(_MSC_VER)
#include <malloc.h>
#endif
#include <fcntl.h>
#include <golded.h>
#include <gwildmat.h>
@@ -773,7 +777,11 @@ void FileRequest(GMsg* msg) {
else
ptr1 = ptr2;
ptr2 = strskip_txt(ptr1);
#if defined(_MSC_VER)
char *tmpbuf = (char*)alloca(ptr2-ptr1+1);
#else
__extension__ char tmpbuf[ptr2-ptr1+1];
#endif
strxcpy(tmpbuf, ptr1, ptr2-ptr1+1);
frqgetfile(file, desc, filesize, tmpbuf);
*desc = NUL; // Description never comes before filename
@@ -811,7 +819,11 @@ void FileRequest(GMsg* msg) {
if(txtptr[16] == '/' and txtptr[19] == '/' and txtptr[24] == '(' /*)*/) {
ptr1 = strskip_wht(txtptr);
ptr2 = strskip_txt(ptr1);
#if defined(_MSC_VER)
char *tmpbuf = (char*)alloca(ptr2-ptr1+1);
#else
__extension__ char tmpbuf[ptr2-ptr1+1];
#endif
strxcpy(tmpbuf, ptr1, ptr2-ptr1+1);
frqgetfile(file, desc, filesize, tmpbuf);
*desc = NUL; // Description never comes before filename
@@ -943,7 +955,11 @@ void FileRequest(GMsg* msg) {
msg->attr.frq1();
ptr = freqfile[n]+1; // 01234567890123456
ptr2 = strskip_txt(ptr);
#if defined(_MSC_VER)
char *tmpbuf = (char*)alloca(ptr2-ptr+1);
#else
__extension__ char tmpbuf[ptr2-ptr+1];
#endif
strxcpy(tmpbuf, ptr, ptr2-ptr+1);
ptr2 = strskip_wht(ptr2);
if((strlen(msg->re) + strlen(tmpbuf)) < sizeof(ISub)) { // We can only fill one subject line in this version...
@@ -962,7 +978,11 @@ void FileRequest(GMsg* msg) {
msg->attr.frq1();
ptr = freqfile[crsr]+1; // 01234567890123456
ptr2 = strskip_txt(ptr);
#if defined(_MSC_VER)
char *tmpbuf = (char*)alloca(ptr2-ptr+1);
#else
__extension__ char tmpbuf[ptr2-ptr+1];
#endif
strxcpy(tmpbuf, ptr, ptr2-ptr+1);
ptr2 = strskip_wht(ptr2);
if((strlen(msg->re) + strlen(tmpbuf)) < sizeof(ISub)) { // We can only fill one subject line in this version...

10
golded3/gehdre.cpp
View File

@@ -24,6 +24,10 @@
// Header edit.
// ------------------------------------------------------------------
#if defined(__MINGW32__) || defined(_MSC_VER)
#include <malloc.h>
#endif
#include <golded.h>
#include <gwinput.h>
@@ -318,8 +322,14 @@ bool GMsgHeaderEdit::validate() {
bool res = set_to_address(msg, &toname, &toaddr, &fromaddr, &subj, 0, LNG->SelectDestNode, lookup);
vcurshow();
#if defined(_MSC_VER) || defined(__MINGW32__)
size_t bot2size = EDIT->HdrNodeLen()+1;
char *bot2 = (char*)alloca(bot2size);
MakeAttrStr(bot2, bot2size, &msg->attr);
#else
__extension__ char bot2[EDIT->HdrNodeLen()+1];
MakeAttrStr(bot2, sizeof(bot2), &msg->attr);
#endif
strsetsz(bot2, EDIT->HdrNodeLen());
window.prints(1, EDIT->HdrNodePos(), C_HEADW, bot2);

6
golded3/geinit.cpp
View File

@@ -447,7 +447,7 @@ static bool ExistCfg(char* path, char* file) {
static bool FindCfg(char* path) {
bool found = false;
if(!is_dir(path)) {
if(fexist(path))
return true;
@@ -702,8 +702,8 @@ void Initialize(int argc, char* argv[]) {
// Read/compile various configs
compiled |= ReadLangCfg(cmdlineforce);
compiled |= ReadKeysCfg(cmdlineforce);
compiled |= ReadHelpCfg(cmdlineforce);
compiled |= bool(ReadKeysCfg(cmdlineforce));
compiled |= bool(ReadHelpCfg(cmdlineforce));
// Initialize sound system
InitSound();

23
golded3/geline.cpp
View File

@@ -24,13 +24,16 @@
// Conversion of a raw message to a linked list of lines.
// ------------------------------------------------------------------
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <malloc.h>
#endif
#include <cstdarg>
#include <golded.h>
#include <gstrmail.h>
#include <gutlcode.h>
#include <ghdrmime.h>
// ------------------------------------------------------------------
#ifdef __UNIX__
@@ -1388,7 +1391,11 @@ int ScanLine(GMsg* msg, Line* line, const char* ptr, int getvalue, int mask) {
ptr++;
char endchar = *ptr;
#if defined(_MSC_VER) || defined(__MINGW32__)
char *kludge = (char*)alloca(ptr-kludge1+1);
#else
__extension__ char kludge[ptr-kludge1+1];
#endif
strxcpy(kludge, kludge1, ptr-kludge1+1);
// Search for it in the known kludges list
@@ -1585,7 +1592,7 @@ void ScanKludges(GMsg* msg, int getvalue) {
nnel = cnd ? next_non_empty(line->next->next) : NULL;
bool nextor = cnd ? (not nnel or nnel->type & GLINE_KLUDGE) and (line->next->txt.find(/*(*/')') != line->next->txt.npos) : false;
if(not line->next or nextkl or nextor) {
gotorig = YES;
originlineno = lineno;
line->type |= GLINE_ORIG;
@@ -1647,11 +1654,11 @@ void ScanKludges(GMsg* msg, int getvalue) {
if(getvalue) {
// This is the new code (experimental)
// It looks for an Origin before taking MSGID
// It looks for an Origin before taking MSGID
// Trust msg->orig if valid and we're in netmail area.
// (msg->orig is already merged with INTL/FMPT/TOPT)
if(not (AA->isnet() and msg->orig.valid())) {
if(not (AA->isnet() and msg->orig.valid())) {
if(CFG->addresslookupfirst and msg->msgid.valid())
msg->orig = msg->msgid;
else if((ptr = strrchr(msg->origin, '(' /*)*/ )) != NULL) {
@@ -2030,7 +2037,7 @@ void MakeLineIndex(GMsg* msg, int margin, bool getvalue, bool header_recode) {
// Get type of line
if(wraps == 0) {
if(gotmultipart) {
if(*ptr == '-' and ptr[1] == '-') {
gstrarray::iterator ib;
@@ -2043,10 +2050,10 @@ void MakeLineIndex(GMsg* msg, int margin, bool getvalue, bool header_recode) {
else if(*ptr == '\n' or *ptr == '\r')
inheader = false;
}
if(inheader and (*ptr != '-'))
line->type |= GLINE_HIDD;
para = 0;
if(*ptr == CTRL_A or inheader) { // Found kludge/hidden line
para = GLINE_KLUD;
@@ -3019,7 +3026,7 @@ char* ParseInternetAddr(char* __string, char* __name, char* __addr, bool detect_
*__name = *__addr = NUL;
char* commaptr = NULL;
if(strchr(__string, ',')) {
bool inquotes = false;
commaptr = __string;

17
golded3/gemlst.cpp
View File

@@ -24,12 +24,15 @@
// Message lister.
// ------------------------------------------------------------------
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <malloc.h>
#endif
#include <golded.h>
#include <gcharset.h>
#include <iostream>
#include <iomanip>
// ------------------------------------------------------------------
extern GMsg* reader_msg;
@@ -210,7 +213,7 @@ void GMsgList::ReadMlst(int n) {
// ------------------------------------------------------------------
void GMsgList::do_delayed() {
// Update header and statusline
if(AA->Msglistheader()) {
ReadMlst(index);
@@ -733,7 +736,7 @@ void GThreadlist::update_title() {
// ------------------------------------------------------------------
void GThreadlist::do_delayed() {
// Update header and statusline
if(AA->Msglistheader()) {
AA->LoadMsg(&msg, list[index].msgno, CFG->dispmargin-(int)CFG->switches.get(disppagebar));
@@ -839,7 +842,11 @@ void GThreadlist::print_line(uint idx, uint pos, bool isbar) {
char buf[256];
ulong maxlev = (window.width()+h_offset+1)/2;
#if defined(_MSC_VER) || defined(__MINGW32__)
char *buf2 = (char*)alloca(maxlev*2+2);
#else
__extension__ char buf2[maxlev*2+2];
#endif
int attrh, attrw;
uint tdlen;
@@ -868,11 +875,11 @@ void GThreadlist::print_line(uint idx, uint pos, bool isbar) {
}
GenTree(buf2, idx, maxlev);
#if defined(__UNIX__) && !defined(__USE_NCURSES__)
gvid_boxcvt(buf2);
#endif
char marks[3];
strcpy(marks, " ");

9
golded3/gemsgs.cpp
View File

@@ -24,11 +24,14 @@
// Misc. msg handling.
// ------------------------------------------------------------------
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <malloc.h>
#endif
#include <cstdarg>
#include <golded.h>
#include <gtimall.h>
// ------------------------------------------------------------------
static bool tokenxchg(char*& dst, char* tok, const char* src, int len = 0, int cnt = 0, ...) {
@@ -450,7 +453,11 @@ void LoadText(GMsg* msg, const char* textfile) {
buf = (char*)throw_malloc(PBUFSIZE);
int tabsz = CFG->disptabsize ? CFG->disptabsize : 1;
#if defined(_MSC_VER) || defined(__MINGW32__)
char *spaces = (char*)alloca(tabsz+1);
#else
__extension__ char spaces[tabsz+1];
#endif
memset(spaces, ' ', tabsz);
spaces[tabsz] = NUL;

33
golded3/geview.cpp
View File

@@ -24,10 +24,13 @@
// Message viewer class implementation.
// ------------------------------------------------------------------
#if defined(_MSC_VER) || defined(__MINGW32__)
#include <malloc.h>
#endif
#include <golded.h>
#include <gutlos.h>
// ------------------------------------------------------------------
GMsgHeaderView::GMsgHeaderView() {
@@ -86,7 +89,7 @@ void GMsgHeaderView::Use(Area *areaptr, GMsg *msgptr) {
msg = msgptr;
}
// ------------------------------------------------------------------
void GMsgHeaderView::Paint() {
@@ -107,7 +110,11 @@ void GMsgHeaderView::Paint() {
else
*buf1 = NUL;
#if defined(_MSC_VER) || defined(__MINGW32__)
char *top = (char*)alloca(width+1);
#else
__extension__ char top[width+1];
#endif
strxmerge(top, width+1, " ", buf1, strtrim(strtmp(area->desc())), " (",
area->isinternet() ? area->Internetaddress() : area->Aka().addr.make_string(buf),
") ", NULL);
@@ -413,7 +420,7 @@ void GMsgBodyView::Use(Area *areaptr, GMsg *msgptr, int startline) {
window.set_scrollbar_color(scrollbar_visible ? scrollbar_color : -1);
}
// ------------------------------------------------------------------
void GMsgBodyView::PaintLine(int row, Line *line) {
@@ -452,7 +459,7 @@ void GMsgBodyView::PaintLine(int row, Line *line) {
void GMsgBodyView::Paint() {
window.activate_quick();
Line* dummy_index = NULL;
Line** line_index = msg->line ? (msg->line + upperline) : &dummy_index;
@@ -474,7 +481,7 @@ int GMsgBodyView::Top(int redraw) {
Paint();
return true;
}
return false;
}
@@ -482,7 +489,7 @@ int GMsgBodyView::Top(int redraw) {
// ------------------------------------------------------------------
int GMsgBodyView::Bottom() {
if(msg->lines > height) {
if(msg->lines <= height) {
can_pagedown = true;
@@ -496,7 +503,7 @@ int GMsgBodyView::Bottom() {
Paint();
return true;
}
return false;
}
@@ -516,7 +523,7 @@ int GMsgBodyView::PageUp() {
return true;
}
}
return false;
}
@@ -537,7 +544,7 @@ int GMsgBodyView::PageDown() {
}
}
}
return false;
}
@@ -545,7 +552,7 @@ int GMsgBodyView::PageDown() {
// ------------------------------------------------------------------
int GMsgBodyView::LineUp() {
if(msg->lines > height) {
if(upperline) {
window.scroll_down();
@@ -596,10 +603,10 @@ int GMsgBodyView::LineDown() {
// ------------------------------------------------------------------
int GMsgBodyView::Continue() {
if(can_pagedown)
return PageDown();
return false;
}
@@ -615,7 +622,7 @@ int GMsgBodyView::ThumbTrack(int pos) {
// ------------------------------------------------------------------
int GMsgBodyView::ThumbPosition(int pos) {
upperline = pos;
lowerline = upperline + height - 1;
can_pagedown = lowerline < (msg->lines-1);

25
golded3/golded3.cpp
View File

@@ -29,18 +29,19 @@
// ------------------------------------------------------------------
#define __GVER_PID__(A,SIZE) __GVER_PRE##SIZE##NAME__ __GVER_##SIZE##NAME__ __GVER_POST##SIZE##NAME__ __GVER_##SIZE##PLATFORM__
#define __GVER_LONGPID__ __GVER_PRENAME__ __GVER_NAME__ __GVER_POSTNAME__ __GVER_PLATFORM__
#define __GVER_SHORTPID__ __GVER_PRESHORTNAME__ __GVER_SHORTNAME__ __GVER_POSTSHORTNAME__ __GVER_SHORTPLATFORM__
#define __GVER_VER__(A,B,C) __GVER_PREVERSION__ #A "." #B "." #C __GVER_POSTVERSION__
#define __GVER_SVER__(A,B,C) #A "." #B "." #C
#define __GVER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__) \
int __gver_major__ = __GVER_MAJOR__; \
int __gver_minor__ = __GVER_MINOR__; \
int __gver_release__ = __GVER_RELEASE__; \
const char* __gver_longpid__ = __GVER_PID__(,); \
const char* __gver_shortpid__ = __GVER_PID__(,SHORT); \
const char* __gver_ver__ = __GVER_VER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__); \
const char* __gver_shortver__ = __GVER_SVER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__);
int __gver_major__ = __GVER_MAJOR__; \
int __gver_minor__ = __GVER_MINOR__; \
int __gver_release__ = __GVER_RELEASE__; \
const char* __gver_longpid__ = __GVER_LONGPID__; \
const char* __gver_shortpid__ = __GVER_SHORTPID__; \
const char* __gver_ver__ = __GVER_VER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__); \
const char* __gver_shortver__ = __GVER_SVER__(__GVER_MAJOR__,__GVER_MINOR__,__GVER_RELEASE__);
// ------------------------------------------------------------------
@@ -97,7 +98,13 @@ const char* __gver_shortver__ = __GVER_SVER__(__GVER_MAJOR__,__GVER_MINOR__,__GV
#define __GVER_SHORTLOGNAME__ "2"
#define __GVER_CFGEXT__ ".geo"
#elif defined(__WIN32__)
#if defined(_MSC_VER)
#define __GVER_PLATFORM__ "/W32-MSVC"
#elif defined(__MINGW32__)
#define __GVER_PLATFORM__ "/W32-MINGW"
#else
#define __GVER_PLATFORM__ "/W32"
#endif
#define __GVER_SHORTPLATFORM__ "W32"
#define __GVER_SHORTLOGNAME__ "W"
#define __GVER_CFGEXT__ ".gew"
@@ -106,7 +113,7 @@ const char* __gver_shortver__ = __GVER_SVER__(__GVER_MAJOR__,__GVER_MINOR__,__GV
#define __GVER_SHORTPLATFORM__ "LNX"
#define __GVER_SHORTLOGNAME__ "L"
#define __GVER_CFGEXT__ ".gel"
#elif defined(__FreeBSD__) || defined(__OpenBSD__)
#elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__)
#define __GVER_PLATFORM__ "/BSD"
#define __GVER_SHORTPLATFORM__ "BSD"
#define __GVER_SHORTLOGNAME__ "B"