From ae131c4da60de42178bb44c281dc22258e83f748 Mon Sep 17 00:00:00 2001 From: Parker Liu Date: Mon, 29 Nov 2021 18:49:24 +0800 Subject: [PATCH] Fix building error in tcp_server/neu_plugin_common.c for macOS --- plugins/restful/normal_handle.c | 4 ++-- src/base/neu_plugin_common.c | 6 +++--- src/connection/tcp_server.c | 7 ++++++- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/restful/normal_handle.c b/plugins/restful/normal_handle.c index b7af2691..968a3656 100644 --- a/plugins/restful/normal_handle.c +++ b/plugins/restful/normal_handle.c @@ -111,7 +111,7 @@ void handle_login(nng_aio *aio) neu_json_login_resp_t login_resp = { 0 }; char * name = "admin"; char * password = "0000"; - uint ret = 0; + int ret = 0; if (strcmp(req->name, name) == 0 && strcmp(req->pass, password) == 0) { @@ -170,4 +170,4 @@ void handle_get_plugin_schema(nng_aio *aio) fclose(fp); http_ok(aio, buf); -} \ No newline at end of file +} diff --git a/src/base/neu_plugin_common.c b/src/base/neu_plugin_common.c index 151ede47..e885ae46 100644 --- a/src/base/neu_plugin_common.c +++ b/src/base/neu_plugin_common.c @@ -407,8 +407,8 @@ neu_taggrp_config_t *neu_system_find_group_config(neu_plugin_t *plugin, } neu_taggrp_config_t *neu_system_ref_group_config(neu_plugin_t *plugin, - neu_node_id_t node_id, - const char * name) + neu_node_id_t node_id, + const char * name) { vector_t grp_configs = neu_system_get_group_configs(plugin, node_id); neu_taggrp_config_t *find_config = NULL; @@ -425,7 +425,7 @@ neu_taggrp_config_t *neu_system_ref_group_config(neu_plugin_t *plugin, vector_uninit(&grp_configs); - return neu_taggrp_cfg_ref(find_config); + return (neu_taggrp_config_t *) neu_taggrp_cfg_ref(find_config); } int neu_plugin_tag_count_by_attribute(neu_taggrp_config_t *grp_config, diff --git a/src/connection/tcp_server.c b/src/connection/tcp_server.c index 5b0f1008..0a658753 100644 --- a/src/connection/tcp_server.c +++ b/src/connection/tcp_server.c @@ -24,6 +24,11 @@ #include #include +#ifndef SOCK_NONBLOCK +#include +#define SOCK_NONBLOCK O_NONBLOCK +#endif + #include "neu_log.h" #include "connection/neu_tcp.h" @@ -195,4 +200,4 @@ ssize_t neu_tcp_server_send(neu_tcp_server_t *server, char *send_buf, } return ret; -} \ No newline at end of file +}