gfwleak/zhangyang-libzt
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor function definition tweaks for C/Swift compatibility

Browse Source
This commit is contained in:
Joseph Henry
2018-08-01 17:01:54 -07:00
parent d37091c8a3
commit 76440565c0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/libzt.h
View File

@@ -37,7 +37,7 @@
#include "libztDefs.h" #include "libztDefs.h"
#include <stdlib.h> #include <stdlib.h>
#include <cstdint> #include <stdint.h>
#if defined(__linux__) || defined(__APPLE__) #if defined(__linux__) || defined(__APPLE__)
#include <sys/socket.h> #include <sys/socket.h>
@@ -99,7 +99,7 @@ ZT_SOCKET_API int ZTCALL zts_set_service_port(int portno);
* @param nwid A 16-digit hexidecimal network identifier (e.g. Earth: `8056c2e21c000001`) * @param nwid A 16-digit hexidecimal network identifier (e.g. Earth: `8056c2e21c000001`)
* @return 0 if successful; or 1 if failed * @return 0 if successful; or 1 if failed
*/ */
ZT_SOCKET_API int ZTCALL zts_start(const char *path, bool blocking); ZT_SOCKET_API int ZTCALL zts_start(const char *path, int blocking);
/** /**
* @brief Starts libzt * @brief Starts libzt

2
src/ZT1Service.cpp
View File

@@ -419,7 +419,7 @@ int zts_ready()
return zts_core_running() && zts_stack_running(); return zts_core_running() && zts_stack_running();
} }
int zts_start(const char *path, bool blocking = false) int zts_start(const char *path, int blocking = false)
{ {
if (zt1Service) { if (zt1Service) {
return 0; // already initialized, ok return 0; // already initialized, ok