Merge pull request #447 from dwrensha/fix-build

Fix autotools build on MacOS

c++/Makefile.am

@@ -244,7 +244,7 @@ libkj_async_la_SOURCES=                                        \
   src/kj/async-io-win32.c++                                    \
   src/kj/time.c++
 
-libkj_http_la_LIBADD = libkj.la $(ASYNC_LIBS) $(PTHREAD_LIBS)
+libkj_http_la_LIBADD = libkj-async.la libkj.la $(ASYNC_LIBS) $(PTHREAD_LIBS)
 libkj_http_la_LDFLAGS = -release $(SO_VERSION) -no-undefined
 libkj_http_la_SOURCES=                                         \
   src/kj/compat/http.c++

c++/src/kj/compat/http.c++

@@ -23,6 +23,7 @@
 #include <kj/debug.h>
 #include <kj/parse/char.h>
 #include <unordered_map>
+#include <stdlib.h>
 
 namespace kj {
 
@@ -1458,7 +1459,7 @@ public:
       inner.writeBodyData(kj::str(*length, "\r\n"));
       auto lengthValue = *length;
       return inner.pumpBodyFrom(input, *length)
-          .then([this,lengthValue](size_t actual) {
+          .then([this,lengthValue](uint64_t actual) {
         if (actual < lengthValue) {
           inner.abortBody();
           KJ_FAIL_REQUIRE(