From c7c878adc8f388091fe9cea3c5f6c20a0bd2906a Mon Sep 17 00:00:00 2001
From: Alexey Sokolov <alexey+znc@asokolov.org>
Date: Sun, 15 Jan 2017 11:36:53 +0000
Subject: [PATCH] Fix build on macOS Sierra (10.12)

Rename OS X to macOS
Add Sierra to Travis
---
 .travis.yml   | 27 ++++++++++++++++++++++++---
 README.md     |  6 +++---
 src/Utils.cpp |  2 +-
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b197b6f5..1f41e2d0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,6 +3,11 @@ env:
     global:
           # SECRET_KEY, used to push docs to github and to init coverity scans
         - secure: "i2f2UVDnyHT/9z0U3XvgTj8eDERvnc1Wk7HpseEjb75JwGzqn/2R+RKHmoSrwK3hFgij2IMxZL19XtHFwMz9t5A/huAAKD74KMMI/QpeZEJ/sjT3CTLcE9HEVDdJOjc7dfLRxb2hZtgvx8clZIMrpeUdPhci8openff30KvXVbg="
+
+# These linux-specific parameters could be moved into matrix.include items, but that's lots of repetition
+sudo: required
+dist: trusty
+
 matrix:
     fast_finish: true
     include:
@@ -22,9 +27,27 @@ matrix:
           compiler: clang
           env: BUILD_TYPE=tsan BUILD_WITH=cmake
         - os: osx
+          osx_image: xcode6.4 # OS X 10.10
           compiler: clang
           env: BUILD_TYPE=normal BUILD_WITH=cmake
         - os: osx
+          osx_image: xcode6.4 # OS X 10.10
+          compiler: clang
+          env: BUILD_TYPE=normal BUILD_WITH=autoconf
+        - os: osx
+          osx_image: xcode7.3 # OS X 10.11
+          compiler: clang
+          env: BUILD_TYPE=normal BUILD_WITH=cmake
+        - os: osx
+          osx_image: xcode7.3 # OS X 10.11
+          compiler: clang
+          env: BUILD_TYPE=normal BUILD_WITH=autoconf
+        - os: osx
+          osx_image: xcode8.2 # macOS 10.12
+          compiler: clang
+          env: BUILD_TYPE=normal BUILD_WITH=cmake
+        - os: osx
+          osx_image: xcode8.2 # macOS 10.12
           compiler: clang
           env: BUILD_TYPE=normal BUILD_WITH=autoconf
         - os: linux
@@ -72,7 +95,7 @@ install:
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew list --versions; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install swig python3 icu4c jq openssl qt5 gettext; fi
-    - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_WITH" == "cmake" ]]; then brew upgrade cmake; fi  # preinstalled cmake on travis is too old
+    - if [[ "$TRAVIS_OS_NAME" == "osx" && "$BUILD_WITH" == "cmake" ]]; then brew outdated cmake || brew upgrade cmake; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew info --json=v1 --installed | jq .; fi
     - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then export PKG_CONFIG_PATH="$(brew --prefix qt5)/lib/pkgconfig:$PKG_CONFIG_PATH"; fi
     - "echo pkg-config path: [$PKG_CONFIG_PATH]"
@@ -133,5 +156,3 @@ notifications:
             secure: "UGh4tbpviOD438ZOi+I3W6eh+R68tbpNIJc0uf5FK6xhHLLo3FRIozkL7CRVA3TxYHuahwerZpBR4TbAyc+gVUn5YRHjdsMIPHPCW/kh8ZkEJKNYXkHerbH0Np6PRLI58l6lmjMQbiWn+lqlgsHdVsyknqxDwoj7JDieE+5X53c="
         password:
             secure: "B2F1coXddY1H0/v3OkiPnUlbnSN/wapRay1PUbN8tvm7IDYOjpivhsRk+31/4pauKOoF4AZhzP6F9mhGxkGYBQ23Td5Y6+uZeaDnTYnXjs8fbV0QY1Mx+2EkHDSkLQoYlYr06pK9q55X3uLK1zTz5Ye0Po3KzbeydxOyyG+xBGg="
-sudo: required
-dist: trusty
diff --git a/README.md b/README.md
index 5fb4990b..e61afb86 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # [![ZNC](http://wiki.znc.in/resources/assets/wiki.png)](http://znc.in) - An advanced IRC bouncer
 
-[![Travis Build Status](https://img.shields.io/travis/znc/znc/master.svg?label=linux%2Fosx)](https://travis-ci.org/znc/znc)
+[![Travis Build Status](https://img.shields.io/travis/znc/znc/master.svg?label=linux%2Fmacos)](https://travis-ci.org/znc/znc)
 [![Jenkins Build Status](https://img.shields.io/jenkins/s/http/jenkins.znc.in/job/znc/master.svg?label=freebsd)](http://jenkins.znc.in/job/znc/job/master/)
 [![AppVeyor Build status](https://img.shields.io/appveyor/ci/DarthGandalf/znc/master.svg?label=windows)](https://ci.appveyor.com/project/DarthGandalf/znc/branch/master)
 [![Bountysource](https://www.bountysource.com/badge/tracker?tracker_id=1759)](https://www.bountysource.com/trackers/1759-znc?utm_source=1759&utm_medium=shield&utm_campaign=TRACKER_BADGE)
@@ -36,7 +36,7 @@ Core:
 SSL/TLS support:
 * openssl 0.9.7d or later
     * try installing openssl-dev, openssl-devel or libssl-dev
-    * Mac OS X: OpenSSL from Homebrew is preferred over system
+    * macOS: OpenSSL from Homebrew is preferred over system
 
 modperl:
 * perl and its bundled libperl
@@ -45,7 +45,7 @@ modperl:
 modpython:
 * python and its bundled libpython
 * perl is required
-* Mac OS X: Python from Homebrew is preferred over system version
+* macOS: Python from Homebrew is preferred over system version
 * SWIG if building from git
 
 cyrusauth:
diff --git a/src/Utils.cpp b/src/Utils.cpp
index e9186dba..bb04035d 100644
--- a/src/Utils.cpp
+++ b/src/Utils.cpp
@@ -417,7 +417,7 @@ timeval CUtils::GetTime() {
 #ifdef HAVE_CLOCK_GETTIME
     timespec ts;
     if (clock_gettime(CLOCK_REALTIME, &ts) == 0) {
-        return { ts.tv_sec, ts.tv_nsec / 1000 };
+        return { ts.tv_sec, static_cast<suseconds_t>(ts.tv_nsec / 1000) };
     }
 #endif