From 5d0605b933dfd37f18f1b46119e2ab28727e097a Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Tue, 26 Jan 2021 14:42:04 +0800 Subject: [PATCH 1/2] [TD-109] : support mac compile with xcode11.4 in travis CI. redefine MSG_NOSIGNAL --- src/os/inc/osDarwin.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/os/inc/osDarwin.h b/src/os/inc/osDarwin.h index 13f93456f2..14b8ccf53c 100644 --- a/src/os/inc/osDarwin.h +++ b/src/os/inc/osDarwin.h @@ -91,7 +91,12 @@ extern "C" { typedef int(*__compar_fn_t)(const void *, const void *); // for send function in tsocket.c -// #define MSG_NOSIGNAL 0 +#if defined(MSG_NOSIGNAL) +#undef MSG_NOSIGNAL +#endif + +#define MSG_NOSIGNAL 0 + #define SO_NO_CHECK 0x1234 #define SOL_TCP 0x1234 #define TCP_KEEPIDLE 0x1234 From 8678883050502c3f3c0b4183543b12d0a7b89f56 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Tue, 26 Jan 2021 14:44:15 +0800 Subject: [PATCH 2/2] [TD-109] : support mac compile with xcode11.4 in travis CI. enable in .travis.yml --- .travis.yml | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9aac6c597c..d814a465e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -270,19 +270,20 @@ matrix: fi - make > /dev/null -# - os: osx -# language: c -# compiler: clang -# env: DESC="mac/clang build" -# git: -# - depth: 1 -# addons: -# homebrew: -# - cmake -# -# script: -# - cd ${TRAVIS_BUILD_DIR} -# - mkdir debug -# - cd debug -# - cmake .. > /dev/null -# - make > /dev/null + - os: osx + osx_image: xcode11.4 + language: c + compiler: clang + env: DESC="mac/clang build" + git: + - depth: 1 + addons: + homebrew: + - cmake + + script: + - cd ${TRAVIS_BUILD_DIR} + - mkdir debug + - cd debug + - cmake .. > /dev/null + - make > /dev/null