planix.org
/
actube
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed to let it compile 

FossilOrigin-Name: 5cd25c59b46f197f0c60250335826a5f963cad90e27c96dbc6ea15e377ba8557
This commit is contained in:
7u83@mail.ru 2020-03-05 22:45:37 +00:00
parent bf7abd2daf
commit b2dcf4e8ee
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/CWConfig.mak
View File

@ -1,4 +1,4 @@
include ../Config.mak include ../Config.mak
WITH_GNUTLS=1 WITH_GNUTLS=1
WITH_OPENSSL=1 WITH_OPENSSL=0

2
src/Config.mak
View File

@ -28,7 +28,7 @@ COMPDEFS+=-DWITH_CW_LOG_DEBUG
WITH_GNUTLS=1 WITH_GNUTLS=1
# Compile in openssl support # Compile in openssl support
WITH_OPENSSL=1 WITH_OPENSSL=0
# #
# #

2
src/WtpConfig.mak
View File

@ -4,7 +4,7 @@ include ../Config.mak
# Define witch SSL library to use # Define witch SSL library to use
# OPENSSL or GNUTLS # OPENSSL or GNUTLS
# #
SSL_LIBRARY=OPENSSL SSL_LIBRARY=GNUTLS
CFLAGS += -I/usr/include/libnl3 CFLAGS += -I/usr/include/libnl3
CFLAGS += -I../contrib/uci CFLAGS += -I../contrib/uci

6
src/cw/cw_ktv_parser.c
View File

@ -21,7 +21,7 @@ void cw_ktv_init_str_reader(struct cw_KTV_Reader *r, const char * str, int len)
{ {
memset(r,0,sizeof(struct cw_KTV_Reader)); memset(r,0,sizeof(struct cw_KTV_Reader));
r->data = str; r->data = str;
r->getchar=str_getc; r->xgetchar=str_getc;
r->ungetchar=str_ungetc; r->ungetchar=str_ungetc;
r->maxlen=len; r->maxlen=len;
} }
@ -47,7 +47,7 @@ struct parser {
static int get_char(struct cw_KTV_Reader *r) static int get_char(struct cw_KTV_Reader *r)
{ {
int c; int c;
c = r->getchar (r); c = r->xgetchar (r);
r->pos++; r->pos++;
if (c=='\n'){ if (c=='\n'){
r->prevpos=r->pos; r->prevpos=r->pos;
@ -356,4 +356,4 @@ int cw_ktv_parse_string(struct cw_KTV_Reader *r, char *key, char *type, char *va
n = read_val(r,val,200); n = read_val(r,val,200);
return n; return n;
} }

2
src/cw/ktv.h
View File

@ -218,7 +218,7 @@ extern const cw_Type_t * cw_ktv_std_types[];
struct cw_KTV_Reader { struct cw_KTV_Reader {
const void * data; const void * data;
int (*getchar)(struct cw_KTV_Reader *); int (*xgetchar)(struct cw_KTV_Reader *);
void (*ungetchar)(struct cw_KTV_Reader *, int c); void (*ungetchar)(struct cw_KTV_Reader *, int c);
int quote; int quote;
int line; int line;

2
src/wtp/configure.c
View File

@ -37,7 +37,7 @@ int configure(struct conn * conn)
cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,"Config ***","CFG: ", "End config ***"); cw_dbg_ktv_dump(conn->remote_cfg,DBG_INFO,"Config ***","CFG: ", "End config ***");
cw_ktv_set_byte(conn->remote_cfg," // cw_ktv_set_byte(conn->remote_cfg,"
exit(0); exit(0);
return 1; return 1;
} }