From bbfb470d233f1d9de6c1b068b0a11dbf78aba2de Mon Sep 17 00:00:00 2001 From: MikalaiR Date: Sun, 7 Feb 2016 18:14:05 +0000 Subject: dbx_kyoto: compilation fix git-svn-id: http://svn.miranda-ng.org/main/trunk@16242 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Dbx_kyoto/src/commonheaders.h | 58 +++++++++++++++++++---------------- 1 file changed, 31 insertions(+), 27 deletions(-) (limited to 'plugins/Dbx_kyoto/src/commonheaders.h') diff --git a/plugins/Dbx_kyoto/src/commonheaders.h b/plugins/Dbx_kyoto/src/commonheaders.h index d6063ec1e3..93e4468c6a 100644 --- a/plugins/Dbx_kyoto/src/commonheaders.h +++ b/plugins/Dbx_kyoto/src/commonheaders.h @@ -26,6 +26,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #pragma warning(disable:4509) +#define SIZEOF(x) _countof(x) + #include #include #include @@ -43,6 +45,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include #include #include +#include +#include #define OWN_CACHED_CONTACT #include @@ -54,33 +58,33 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. extern HINSTANCE g_hInst; extern LIST g_Dbs; -struct VisitorCopy : public TreeDB::Visitor -{ - __forceinline explicit VisitorCopy() : kbuf_(NULL), ksiz_(0) {} - - const char* visit_full(const char* kbuf, size_t ksiz, const char* vbuf, size_t vsiz, size_t* sp) - { - kbuf_ = kbuf; - ksiz_ = ksiz; - return NOP; - } - const char* kbuf_; - size_t ksiz_; -}; - -struct VisitorCopyRec : public TreeDB::Visitor -{ - __forceinline explicit VisitorCopyRec() : vbuf_(NULL), vsiz_(0) {} - - const char* visit_full(const char* kbuf, size_t ksiz, const char* vbuf, size_t vsiz, size_t* sp) - { - vbuf_ = vbuf; - vsiz_ = vsiz; - return NOP; - } - const char* vbuf_; - size_t vsiz_; -}; +struct VisitorCopy : public TreeDB::Visitor +{ + __forceinline explicit VisitorCopy() : kbuf_(NULL), ksiz_(0) {} + + const char* visit_full(const char* kbuf, size_t ksiz, const char* vbuf, size_t vsiz, size_t* sp) + { + kbuf_ = kbuf; + ksiz_ = ksiz; + return NOP; + } + const char* kbuf_; + size_t ksiz_; +}; + +struct VisitorCopyRec : public TreeDB::Visitor +{ + __forceinline explicit VisitorCopyRec() : vbuf_(NULL), vsiz_(0) {} + + const char* visit_full(const char* kbuf, size_t ksiz, const char* vbuf, size_t vsiz, size_t* sp) + { + vbuf_ = vbuf; + vsiz_ = vsiz; + return NOP; + } + const char* vbuf_; + size_t vsiz_; +}; class cursor_ptr { -- cgit v1.2.3