From aaced28489b67c0fc672b2adbee5d9d7f51bb39e Mon Sep 17 00:00:00 2001 From: alex Date: Sun, 14 Mar 2004 18:31:15 +0000 Subject: [PATCH] Patch level : 2.1 nopatch Files correlati : Ricompilazione Demo : [ ] Commento : Modifiche dalla versione LInux sulla 2.1 git-svn-id: svn://10.65.10.50/trunk@11860 c028cbd2-c16b-5b4b-a496-9718f37d4682 --- include/ccustio.c | 2 +- include/cfiles.c | 5 +++-- include/relation.cpp | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/include/ccustio.c b/include/ccustio.c index 4c95ace78..942348159 100755 --- a/include/ccustio.c +++ b/include/ccustio.c @@ -300,7 +300,7 @@ void CChsize(S, Name, Len, Base, MaxSec) #endif if ((S->IOR = CIOResult()) != NoErr) return ; #ifdef WIN32 - if (chsize(S->F, ((RecNoType) MaxSec)*BlockLenIO) == -1)#else + if (chsize(S->F, ((RecNoType) MaxSec)*BlockLenIO) == -1) #else if (lseek(S->F, ((RecNoType) MaxSec)*BlockLenIO, SEEK_SET) == -1) #endif diff --git a/include/cfiles.c b/include/cfiles.c index 32836f2ba..a40ed7fbf 100755 --- a/include/cfiles.c +++ b/include/cfiles.c @@ -420,13 +420,14 @@ const char* CGetCampoIni(void) { char exedir[_MAX_PATH], path[_MAX_PATH]; DIRECTORY dir; +#ifdef WIN32 + BOOLEAN bFound = FALSE; +#endif // Nelle installazioni sfigate con programmi in rete cerca di stabilire il percorso locale di Campo.ini xvt_fsys_get_default_dir(&dir); xvt_fsys_convert_dir_to_str(&dir, exedir, sizeof(exedir)); #ifdef WIN32 - BOOLEAN bFound = FALSE; - if (xvt_fsys_is_network_drive(exedir)) { bFound = CGetCampoStpValue("CampoIni", path, sizeof(path)); diff --git a/include/relation.cpp b/include/relation.cpp index 3c43cb398..44f51a7c9 100755 --- a/include/relation.cpp +++ b/include/relation.cpp @@ -289,7 +289,7 @@ void TRelation::restore_status() { int i; - for (int i = _files.last(); i >= 0 ; i--) + for (i = _files.last(); i >= 0 ; i--) { const int err = _status.get_int(i*3); const TRecnotype recno = _status.get_long();