[sword-svn] r3821 - in trunk: include lib/bcppmake src/mgr src/modules/comments src/modules/comments/hrefcom src/modules/comments/rawcom src/modules/comments/rawcom4 src/modules/comments/rawfiles src/modules/comments/zcom src/modules/comments/zcom4 src/modules/texts src/modules/texts/rawtext src/modules/texts/rawtext4 src/modules/texts/ztext src/modules/texts/ztext4 src/utilfuns
scribe at crosswire.org
scribe at crosswire.org
Mon Nov 2 13:33:02 EST 2020
Author: scribe
Date: 2020-11-02 13:33:02 -0500 (Mon, 02 Nov 2020)
New Revision: 3821
Modified:
trunk/include/swcom.h
trunk/include/swtext.h
trunk/lib/bcppmake/libsword.bpr
trunk/src/mgr/curlftpt.cpp
trunk/src/mgr/curlhttpt.cpp
trunk/src/modules/comments/hrefcom/hrefcom.cpp
trunk/src/modules/comments/rawcom/rawcom.cpp
trunk/src/modules/comments/rawcom4/rawcom4.cpp
trunk/src/modules/comments/rawfiles/rawfiles.cpp
trunk/src/modules/comments/swcom.cpp
trunk/src/modules/comments/zcom/zcom.cpp
trunk/src/modules/comments/zcom4/zcom4.cpp
trunk/src/modules/texts/rawtext/rawtext.cpp
trunk/src/modules/texts/rawtext4/rawtext4.cpp
trunk/src/modules/texts/swtext.cpp
trunk/src/modules/texts/ztext/ztext.cpp
trunk/src/modules/texts/ztext4/ztext4.cpp
trunk/src/utilfuns/ftplib.c
Log:
Changes to fix building with older compilers.
Modified: trunk/include/swcom.h
===================================================================
--- trunk/include/swcom.h 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/include/swcom.h 2020-11-02 18:33:02 UTC (rev 3821)
@@ -56,7 +56,8 @@
protected:
VerseKey &getVerseKey(SWKey *key = 0);
- const VerseKey &getVerseKey(const SWKey *key = 0) const;
+ const VerseKey &getVerseKey(const SWKey *key = 0) const { return getVerseKeyConst(key); }
+ const VerseKey &getVerseKeyConst(const SWKey *key = 0) const;
public:
Modified: trunk/include/swtext.h
===================================================================
--- trunk/include/swtext.h 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/include/swtext.h 2020-11-02 18:33:02 UTC (rev 3821)
@@ -43,7 +43,8 @@
char *versification;
protected:
- const VerseKey &getVerseKey(const SWKey *key=0) const;
+ const VerseKey &getVerseKey(const SWKey *key=0) const { return getVerseKeyConst(key); }
+ const VerseKey &getVerseKeyConst(const SWKey *key=0) const;
VerseKey &getVerseKey(SWKey *key=0);
public:
Modified: trunk/lib/bcppmake/libsword.bpr
===================================================================
--- trunk/lib/bcppmake/libsword.bpr 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/lib/bcppmake/libsword.bpr 2020-11-02 18:33:02 UTC (rev 3821)
@@ -146,7 +146,7 @@
<PATHRC value=".;"/>
<PATHASM value=".;"/>
<LINKER value="TLib"/>
- <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;_DEBUG"/>
+ <USERDEFINES value="UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;OLDCURL"/>
<SYSDEFINES value="NO_STRICT"/>
<MAINSOURCE value="libsword.bpf"/>
<INCLUDEPATH value="..\..\src\modules\comments\zcom4;..\..\src\modules\texts\ztext4;..\..\src\modules\comments\rawcom4;..\..\src\modules\texts\rawtext4;..\..\src\modules\tests;..\..\src\utilfuns\zlib;..\..\src\modules\lexdict\zld;..\..\src\modules\lexdict\rawld4;..\..\src\modules\comments\zcom;..\..\src\modules\genbook\rawgenbook;..\..\src\modules\genbook;..\..\src\modules\texts\ztext;..\..\src\modules\texts\rawtext;..\..\src\modules\texts;..\..\src\modules\lexdict\rawld;..\..\src\modules\lexdict;..\..\src\modules\filters;..\..\src\modules\common;..\..\src\modules\comments\rawfiles;..\..\src\modules\comments\rawcom;..\..\src\modules\comments\hrefcom;..\..\src\modules\comments;..\..\src\modules;..\..\src\frontend;..\..\src\utilfuns;..\..\src\mgr;..\..\src\keys;..\..\..\icu-sword\source\common;..\..\apps\windoze\CBuilder5\InstallMgr\curl\include;..\..\include;..\..\include\internal\regex;$(BCB)\include;$(BCB)\include\vcl;..\..\..\icu-sword\source\i18n;..\..\..\biblecs\clucene\src;..\..\..\biblecs\apps\InstallMgr\curl\include"/>
@@ -174,9 +174,9 @@
-D_ICU_ -D_ICUSWORD_ -DUSBINARY -DU_HAVE_PLACEMENT_NEW=0 -DUSELUCENE
-D_WIN32 -D_CL_DISABLE_MULTITHREADING -DCURLAVAILABLE
-DLUCENE_ENABLE_REFCOUNT -no_tie -boa"/>
- <CFLAG1 value="-Od -Vx -X- -r- -a8 -4 -b- -k -y -v -vi- -c -tW -tWM"/>
- <PFLAGS value="-$Y+ -$W -$O- -v -JPHNE -M"/>
- <AFLAGS value="/mx /w2 /zi"/>
+ <CFLAG1 value="-O2 -Vx -X- -a8 -4 -b- -k- -vi -c -tW -tWM"/>
+ <PFLAGS value="-$Y- -$L- -$D- -v -JPHNE -M"/>
+ <AFLAGS value="/mx /w2 /zn"/>
<LFLAGS value="/P1024"/>
</OPTIONS>
<LINKER>
@@ -254,34 +254,35 @@
Item0=$(BCB)\source\vcl
[HistoryLists\hlConditionals]
-Count=27
-Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;_DEBUG
+Count=28
+Item0=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;OLDCURL
Item1=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2
-Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT
-Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG
-Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE
-Item5=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item6=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
-Item7=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item8=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE
-Item9=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item10=_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item11=__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
-Item12=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item13=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
-Item14=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
-Item15=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
-Item16=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
-Item17=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
-Item18=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
-Item19=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
-Item20=_ICU_;_ICUSWORD_;USBINARY
-Item21=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG
-Item22=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE
-Item23=;USBINARY;_DEBUG
-Item24=_ICU_;_ICUSWORD_
-Item25=_ICU_;_ICUSWORD_;_DEBUG
-Item26=_DEBUG
+Item2=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;EXCLUDEXZ;EXCLUDEBZIP2;_DEBUG
+Item3=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT
+Item4=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE;LUCENE_ENABLE_REFCOUNT;_DEBUG
+Item5=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;CURLAVAILABLE
+Item6=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item7=UNICODE;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;_DEBUG
+Item8=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item9=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING;UNICODE
+Item10=_UCS2;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item11=_ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item12=__ASCII;_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;_WIN32;_CL_DISABLE_MULTITHREADING
+Item13=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item14=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT;_DEBUG
+Item15=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE;LUCENE_DISABLE_MULTITHREADING;_WIN32;HAVE_DIRENT
+Item16=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG;USELUCENE
+Item17=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0;_DEBUG
+Item18=_ICU_;_ICUSWORD_;USBINARY;U_HAVE_PLACEMENT_NEW=0
+Item19=_ICU_;_ICUSWORD_;USBINARY;_DEBUG;U_HAVE_PLACEMENT_NEW=0
+Item20=_ICU_;_ICUSWORD_;USBINARY;_DEBUG
+Item21=_ICU_;_ICUSWORD_;USBINARY
+Item22=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE;_DEBUG
+Item23=_ICU_;_ICUSWORD_;USBINARY;CURLAVAILABLE
+Item24=;USBINARY;_DEBUG
+Item25=_ICU_;_ICUSWORD_
+Item26=_ICU_;_ICUSWORD_;_DEBUG
+Item27=_DEBUG
[HistoryLists\hlFinalOutputDir]
Count=3
Modified: trunk/src/mgr/curlftpt.cpp
===================================================================
--- trunk/src/mgr/curlftpt.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/mgr/curlftpt.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -163,9 +163,13 @@
/* Switch on full protocol/debug output */
curl_easy_setopt(session, CURLOPT_VERBOSE, true);
+#ifndef OLDCURL
curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT_MS, timeoutMillis);
curl_easy_setopt(session, CURLOPT_TIMEOUT_MS, timeoutMillis);
-
+#else
+ curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, timeoutMillis/1000);
+ curl_easy_setopt(session, CURLOPT_TIMEOUT, timeoutMillis/1000);
+#endif
/* FTP connection settings */
#if (LIBCURL_VERSION_MAJOR > 7) || \
@@ -190,7 +194,12 @@
curl_easy_setopt(session, CURLOPT_PROGRESSDATA, (void*)NULL);
if (CURLE_OK != res) {
- if (CURLE_FTP_ACCEPT_TIMEOUT == res || CURLE_OPERATION_TIMEDOUT == res) {
+ if (CURLE_OPERATION_TIMEDOUT == res
+// older CURL doesn't define this
+#ifdef CURLE_FTP_ACCEPT_TIMEOUT
+ || CURLE_FTP_ACCEPT_TIMEOUT == res
+#endif
+ ) {
retVal = -2;
}
else {
Modified: trunk/src/mgr/curlhttpt.cpp
===================================================================
--- trunk/src/mgr/curlhttpt.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/mgr/curlhttpt.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -136,9 +136,14 @@
/* Switch on full protocol/debug output */
curl_easy_setopt(session, CURLOPT_VERBOSE, true);
+#ifndef OLDCURL
curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT_MS, timeoutMillis);
curl_easy_setopt(session, CURLOPT_TIMEOUT_MS, timeoutMillis);
-
+#else
+ curl_easy_setopt(session, CURLOPT_CONNECTTIMEOUT, timeoutMillis/1000);
+ curl_easy_setopt(session, CURLOPT_TIMEOUT, timeoutMillis/1000);
+#endif
+
/* Disable checking host certificate */
if (isUnverifiedPeerAllowed()) {
curl_easy_setopt(session, CURLOPT_SSL_VERIFYPEER, false);
@@ -165,7 +170,11 @@
SWLog::getSystemLog()->logDebug("***** Finished performing curl easy action. \n");
if(CURLE_OK != res) {
- if (CURLE_FTP_ACCEPT_TIMEOUT == res || CURLE_OPERATION_TIMEDOUT == res) {
+ if (CURLE_OPERATION_TIMEDOUT == res
+#ifdef CURLE_FTP_ACCEPT_TIMEOUT
+ || CURLE_FTP_ACCEPT_TIMEOUT == res
+#endif
+ ) {
retVal = -2;
}
else {
Modified: trunk/src/modules/comments/hrefcom/hrefcom.cpp
===================================================================
--- trunk/src/modules/comments/hrefcom/hrefcom.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/comments/hrefcom/hrefcom.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -86,7 +86,7 @@
entryBuf += tmpbuf.c_str();
prepText(entryBuf);
- if (key != this->key)
+ if (key != (const VerseKey *)this->key)
delete key;
return entryBuf;
Modified: trunk/src/modules/comments/rawcom/rawcom.cpp
===================================================================
--- trunk/src/modules/comments/rawcom/rawcom.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/comments/rawcom/rawcom.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -137,8 +137,8 @@
void RawCom::linkEntry(const SWKey *inkey) {
- VerseKey *destkey = &getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ VerseKey *destkey = &(VerseKey &)getVerseKey();
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
Modified: trunk/src/modules/comments/rawcom4/rawcom4.cpp
===================================================================
--- trunk/src/modules/comments/rawcom4/rawcom4.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/comments/rawcom4/rawcom4.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -137,7 +137,7 @@
void RawCom4::linkEntry(const SWKey *inkey) {
VerseKey *destkey = &getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
}
Modified: trunk/src/modules/comments/rawfiles/rawfiles.cpp
===================================================================
--- trunk/src/modules/comments/rawfiles/rawfiles.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/comments/rawfiles/rawfiles.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -159,7 +159,7 @@
SWBuf tmpbuf;
readText(key->getTestament(), start, size + 2, tmpbuf);
- key = &getVerseKey(inkey);
+ key = &getVerseKeyConst(inkey);
doSetText(key->getTestament(), key->getTestamentIndex(), tmpbuf.c_str());
}
}
Modified: trunk/src/modules/comments/swcom.cpp
===================================================================
--- trunk/src/modules/comments/swcom.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/comments/swcom.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -87,7 +87,7 @@
}
-const VerseKey &SWCom::getVerseKey(const SWKey *keyToConvert) const {
+const VerseKey &SWCom::getVerseKeyConst(const SWKey *keyToConvert) const {
const SWKey *thisKey = keyToConvert ? keyToConvert : this->key;
const VerseKey *key = 0;
Modified: trunk/src/modules/comments/zcom/zcom.cpp
===================================================================
--- trunk/src/modules/comments/zcom/zcom.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/comments/zcom/zcom.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -131,7 +131,7 @@
void zCom::linkEntry(const SWKey *inkey) {
VerseKey *destkey = &getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
Modified: trunk/src/modules/comments/zcom4/zcom4.cpp
===================================================================
--- trunk/src/modules/comments/zcom4/zcom4.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/comments/zcom4/zcom4.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -131,7 +131,7 @@
void zCom4::linkEntry(const SWKey *inkey) {
VerseKey *destkey = &getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey->getTestament(), destkey->getTestamentIndex(), srckey->getTestamentIndex());
Modified: trunk/src/modules/texts/rawtext/rawtext.cpp
===================================================================
--- trunk/src/modules/texts/rawtext/rawtext.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/texts/rawtext/rawtext.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -114,7 +114,7 @@
void RawText::linkEntry(const SWKey *inkey) {
VerseKey &destkey = getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
}
Modified: trunk/src/modules/texts/rawtext4/rawtext4.cpp
===================================================================
--- trunk/src/modules/texts/rawtext4/rawtext4.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/texts/rawtext4/rawtext4.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -98,7 +98,7 @@
void RawText4::linkEntry(const SWKey *inkey) {
VerseKey &destkey = getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
}
Modified: trunk/src/modules/texts/swtext.cpp
===================================================================
--- trunk/src/modules/texts/swtext.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/texts/swtext.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -92,7 +92,7 @@
}
-const VerseKey &SWText::getVerseKey(const SWKey *keyToConvert) const {
+const VerseKey &SWText::getVerseKeyConst(const SWKey *keyToConvert) const {
const SWKey *thisKey = keyToConvert ? keyToConvert : this->key;
const VerseKey *key = 0;
Modified: trunk/src/modules/texts/ztext/ztext.cpp
===================================================================
--- trunk/src/modules/texts/ztext/ztext.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/texts/ztext/ztext.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -132,7 +132,7 @@
void zText::linkEntry(const SWKey *inkey) {
VerseKey &destkey = getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
}
Modified: trunk/src/modules/texts/ztext4/ztext4.cpp
===================================================================
--- trunk/src/modules/texts/ztext4/ztext4.cpp 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/modules/texts/ztext4/ztext4.cpp 2020-11-02 18:33:02 UTC (rev 3821)
@@ -132,7 +132,7 @@
void zText4::linkEntry(const SWKey *inkey) {
VerseKey &destkey = getVerseKey();
- const VerseKey *srckey = &getVerseKey(inkey);
+ const VerseKey *srckey = &getVerseKeyConst(inkey);
doLinkEntry(destkey.getTestament(), destkey.getTestamentIndex(), srckey->getTestamentIndex());
}
Modified: trunk/src/utilfuns/ftplib.c
===================================================================
--- trunk/src/utilfuns/ftplib.c 2020-10-24 20:27:30 UTC (rev 3820)
+++ trunk/src/utilfuns/ftplib.c 2020-11-02 18:33:02 UTC (rev 3821)
@@ -87,6 +87,10 @@
#else
#define lllog(M) fprintf(stderr, M);
#endif
+#ifndef socklen_t
+#define socklen_t int
+#endif
+
void *mymemccpy(void *dst, const void *src, int c, size_t n)
{
char* q = dst;
More information about the sword-cvs
mailing list