diff --git a/src/include/mask.cpp b/src/include/mask.cpp index 75dd52c34..649561696 100755 --- a/src/include/mask.cpp +++ b/src/include/mask.cpp @@ -1194,6 +1194,7 @@ int TMask::win2page(WINDOW w) const TMask_field* TMask::parse_field(TScanner& scanner) { const TString& k = scanner.key(); + if (k == "BO") return new TBoolean_field(this); if (k == "BR") return new TBrowsefile_field(this); if (k == "BU") return new TButton_field(this); diff --git a/src/include/mov.h b/src/include/mov.h index 266340987..4f18392b6 100755 --- a/src/include/mov.h +++ b/src/include/mov.h @@ -61,7 +61,6 @@ #define MOV_KEYFPPRO "KEYFPPRO" #define MOV_MOVCOLL "MOVCOLL" #define MOV_ELABF9 "ELABF9" - #define MOV_IDDOCSDI "IDDOCSDI" #define MOV_DATADOCSDI "DATADOCSDI" diff --git a/src/include/relation.cpp b/src/include/relation.cpp index bbb6213d9..01e57fc8b 100755 --- a/src/include/relation.cpp +++ b/src/include/relation.cpp @@ -1423,7 +1423,6 @@ TRecnotype TCursor::update() _lastrec = eod; _index_firm = prefix().get_codditta(); _lastkrec = DB_changed(handle); - return _totrec; } diff --git a/src/include/winsock.h b/src/include/winsock.h index 8b94a04cc..5894f661d 100755 --- a/src/include/winsock.h +++ b/src/include/winsock.h @@ -490,6 +490,7 @@ struct linger { /* * Windows Sockets definitions of regular Microsoft C error constants */ +#ifndef WSAEINTR #define WSAEINTR (WSABASEERR+4) #define WSAEBADF (WSABASEERR+9) #define WSAEACCES (WSABASEERR+13) @@ -497,6 +498,7 @@ struct linger { #define WSAEINVAL (WSABASEERR+22) #define WSAEMFILE (WSABASEERR+24) + /* * Windows Sockets definitions of regular Berkeley error constants */ @@ -581,6 +583,7 @@ struct linger { /* * Windows Sockets errors redefined as regular Berkeley error constants */ + #define EWOULDBLOCK WSAEWOULDBLOCK #define EINPROGRESS WSAEINPROGRESS #define EALREADY WSAEALREADY @@ -618,6 +621,7 @@ struct linger { #define EDQUOT WSAEDQUOT #define ESTALE WSAESTALE #define EREMOTE WSAEREMOTE +#endif /* Socket function prototypes */