Merge remote-tracking branch 'joakimsoderberg/new_cmake'

Conflicts:
	sample/https-client.c

diff --cc bufferevent_openssl.c
Simple merge

diff --cc sample/https-client.c
index dfb77c66bc5fab45c4200c498b8d6b34bea27209,6a9d1bafa28b85ba0085ce538d8ff52d4cfaf279..3721378b2203d41216e79b8cf8b8f25390f03469
--- 1/sample/https-client.c
--- 2/sample/https-client.c
+++ b/sample/https-client.c
@@@ -194,34 -192,27 +202,50 @@@ main(int argc, char **argv
        struct evhttp_connection *evcon;
        struct evhttp_request *req;
        struct evkeyvalq *output_headers;
 +      struct evbuffer * output_buffer;
 +
 +      int i;
 +
 +      for (i = 1; i < argc; i++) {
 +              if (!strcmp("-url", argv[i])) {
 +                      if (i < argc - 1) {
 +                              url = argv[i + 1];
 +                      } else {
 +                              syntax();
 +                      }
 +              } else if (!strcmp("-ignore-cert", argv[i])) {
 +                      ignore_cert = 1;
 +              } else if (!strcmp("-data", argv[i])) {
 +                      if (i < argc - 1) {
 +                              data_file = argv[i + 1];
 +                      } else {
 +                              syntax();
 +                      }
 +              } else if (!strcmp("-help", argv[i])) {
 +                      syntax();
 +              }
 +      }
  
 -      if (argc != 2)
 +      if (!url) {
                syntax();
 +      }
  
 -      url = argv[1];
+ #ifdef _WIN32
+       {
+               WORD wVersionRequested;
+               WSADATA wsaData;
+               int err;
+ 
+               wVersionRequested = MAKEWORD(2, 2);
+ 
+               err = WSAStartup(wVersionRequested, &wsaData);
+               if (err != 0) {
+                       printf("WSAStartup failed with error: %d\n", err);
+                       return 1;
+               }
+       }
+ #endif // _WIN32
+ 
        http_uri = evhttp_uri_parse(url);
        if (http_uri == NULL) {
                die("malformed url");

diff --cc test/bench.c
Simple merge

diff --cc test/bench_http.c
index 801fd2a6e4b4d825dce5c3075a6388be294c7b24,255aae5798d3873ff0bb7561f2e8d79ec9f1cedb..6d0d971799b5b106672d481aaca540d8824d4370
--- 1/test/bench_http.c
--- 2/test/bench_http.c
+++ b/test/bench_http.c
@@@ -183,9 -182,12 +183,13 @@@ main(int argc, char **argv
                struct timeval tv={99999999,0};
                event_base_loopexit(base, &tv);
        }
 +#endif
        event_base_dispatch(base);
  
+ #ifdef _WIN32
+       WSACleanup();
+ #endif
+ 
        /* NOTREACHED */
        return (0);
  }

diff --cc test/regress_bufferevent.c
Simple merge