From ab273dd3da6c842dc9e21ec1eea3f8b38d416381 Mon Sep 17 00:00:00 2001 From: Ramki Ananthakrishnan Date: Thu, 1 Mar 2018 11:46:52 -0800 Subject: [PATCH 1/2] Fixed build on Mac. --- autogen.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/autogen.sh b/autogen.sh index 9557488..0c3ec0b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -25,6 +25,7 @@ # PACKAGE="Lib noPoll: a websocket toolkit" +OS=`uname -s` (automake --version) < /dev/null > /dev/null 2>&1 || { echo; @@ -44,7 +45,11 @@ echo "Generating configuration files for $PACKAGE, please wait...." echo; touch NEWS README AUTHORS ChangeLog +if [ "${OS}" = "Darwin" ] ; then +glibtoolize --force; +else libtoolize --force; +fi aclocal $ACLOCAL_FLAGS; autoheader --warnings=error automake --add-missing -Werror; From 3c286b73d72ddb0a003833e9f756b344297f1d94 Mon Sep 17 00:00:00 2001 From: Ramki Ananthakrishnan Date: Thu, 1 Mar 2018 12:01:24 -0800 Subject: [PATCH 2/2] Fixed error due to implicit conversion from unsigned 'int' to 'char'. The nopoll API expect 'char'. It does not seem to matter what values are passed for the testing as these values are random and not being checked anywhere for verification. --- test/nopoll-regression-client.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/nopoll-regression-client.c b/test/nopoll-regression-client.c index 4117a21..f2635f0 100644 --- a/test/nopoll-regression-client.c +++ b/test/nopoll-regression-client.c @@ -1678,8 +1678,8 @@ nopoll_bool test_17_send_and_receive_test (noPollCtx * ctx, noPollConn * conn, n /* printf ("Test 17: sending partial content..\n"); */ _socket = nopoll_conn_socket (conn); - buffer[0] = 129; - buffer[1] = 150; + buffer[0] = 126; + buffer[1] = 127; send (_socket, buffer, 2, 0); if (read_after_header) {