From d1f7dac14c4a9aa146115529d652614047c45544 Mon Sep 17 00:00:00 2001 From: deffpuzzl Date: Fri, 22 Jun 2018 09:43:25 +0800 Subject: [PATCH] Release 1.2.4 --- include/tmain.h | 1 - include/tvm.h | 19 +++++++++++++++++-- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/include/tmain.h b/include/tmain.h index 85a16c1..0a4d4b3 100644 --- a/include/tmain.h +++ b/include/tmain.h @@ -23,7 +23,6 @@ #define _HHH_TVM_DOMAIN_HHH__ #include "tvm.h" - typedef struct epoll_event epollevt; typedef long (*FUNCEXEC)(SATvm *pstSavm, void *arg); diff --git a/include/tvm.h b/include/tvm.h index 10e3b91..aab2aeb 100644 --- a/include/tvm.h +++ b/include/tvm.h @@ -328,9 +328,9 @@ typedef long CREATE; #define IDX_FIELD(t, f, a) if(RC_SUCC != lAddIdxField(tbl, type, FPOS(t, f), FLEN(t, f), a, #f)) \ return RC_FAIL; #define FIELD(t, f, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), #f, a, CHK_SELECT)) \ - return RC_FAIL; + return RC_FAIL; #define FIELU(t, f, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), #f, a, IDX_SELECT)) \ - return RC_FAIL; + return RC_FAIL; #define FIELR(t, f, a) if(RC_SUCC != lSetTableIdx(tbl, FPOS(t, f), FLEN(t, f), #f, a, RCD_SELECT)) \ return RC_FAIL; #define FINISH return RC_SUCC; @@ -339,6 +339,15 @@ typedef long CREATE; /************************************************************************************************* Field assignment *************************************************************************************************/ +#define conditvoid(p,v,l,t) do{ \ + p->stCond.uFldcmp = 0; \ + p->stUpdt.uFldcmp = 0; \ + p->lFind = 0; \ + p->tblName = t; \ + p->lSize = l; \ + p->pstVoid = (void *)&(v); \ + }while(0); + #define conditbind(p,v,t) do{ \ p->stCond.uFldcmp = 0; \ p->stUpdt.uFldcmp = 0; \ @@ -367,6 +376,12 @@ typedef long CREATE; p->pstVoid = NULL; \ }while(0); +#define queuevoid(p,v,l,t) do{ \ + p->lSize = l; \ + p->tblName = t; \ + p->pstVoid = (void *)&v; \ + }while(0); + #define queueinit(p,v,t) do{ \ p->lSize = sizeof(v); \ p->tblName = t; \