[win] removed exported zlib symbols

common.gypi

@@ -29,8 +29,18 @@
 
     # Don't bake anything extra into the snapshot.
     'v8_use_external_startup_data%': 0,
+
 
     'conditions': [
+      ['OS=="win" and component=="shared_library"', {
+        # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
+        'win_release_RuntimeLibrary%': '2', # 2 = /MD (nondebug DLL)
+        'win_debug_RuntimeLibrary%': '3',   # 3 = /MDd (debug DLL)
+      }, {
+        # See http://msdn.microsoft.com/en-us/library/aa652367.aspx
+        'win_release_RuntimeLibrary%': '0', # 0 = /MT (nondebug static)
+        'win_debug_RuntimeLibrary%': '1',   # 1 = /MTd (debug static)
+      }],
       ['OS == "win"', {
         'os_posix': 0,
         'v8_postmortem_support%': 'false',
@@ -82,7 +92,7 @@
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
-            'RuntimeLibrary': 1, # static debug
+            'RuntimeLibrary': '<(win_debug_RuntimeLibrary), # static debug
             'Optimization': 0, # /Od, no optimization
             'MinimalRebuild': 'false',
             'OmitFramePointers': 'false',
@@ -119,7 +129,7 @@
         ],
         'msvs_settings': {
           'VCCLCompilerTool': {
-            'RuntimeLibrary': 0, # static release
+            'RuntimeLibrary': '<(win_release_RuntimeLibrary), # static release
             'Optimization': 3, # /Ox, full optimization
             'FavorSizeOrSpeed': 1, # /Ot, favour speed over size
             'InlineFunctionExpansion': 2, # /Ob2, inline anything eligible

config.gypi

@@ -0,0 +1,39 @@
+# Do not edit. Generated by the configure script.
+{ 'target_defaults': { 'cflags': [],
+                       'default_configuration': 'Release',
+                       'defines': ['OPENSSL_NO_SSL2=1'],
+                       'include_dirs': [],
+                       'libraries': []},
+  'variables': { 'clang': 1,
+                 'gcc_version': 49,
+                 'host_arch': 'x64',
+                 'icu_small': 'false',
+                 'node_install_npm': 'true',
+                 'node_prefix': '',
+                 'node_shared': 'true',
+                 'node_shared_http_parser': 'false',
+                 'node_shared_libuv': 'false',
+                 'node_shared_openssl': 'false',
+                 'node_shared_v8': 'false',
+                 'node_shared_zlib': 'false',
+                 'node_tag': '',
+                 'node_release_urlbase': '',
+                 'node_byteorder': 'little',
+                 'node_use_dtrace': 'false',
+                 'node_use_etw': 'false',
+                 'node_use_mdb': 'false',
+                 'node_use_openssl': 'true',
+                 'node_use_perfctr': 'false',
+                 'openssl_no_asm': 0,
+                 'python': '/usr/bin/python',
+                 'target_arch': 'x64',
+                 'uv_library': 'static_library',
+                 'uv_parent_path': '/deps/uv/',
+                 'uv_use_dtrace': 'false',
+                 'v8_enable_gdbjit': 0,
+                 'v8_enable_i18n_support': 0,
+                 'v8_no_strict_aliasing': 1,
+                 'v8_optimized_debug': 0,
+                 'v8_random_seed': 0,
+                 'v8_use_snapshot': 'true',
+                 'want_separate_host_toolset': 0}}

deps/cares/cares.gyp

@@ -1,4 +1,7 @@
 {
+  'variables': {
+    'library%': 'static_library',
+  },
   'target_defaults': {
     'conditions': [
       ['OS!="win"', {
@@ -112,6 +115,7 @@
         }],
         [ 'OS=="win"', {
           'include_dirs': [ 'config/win32' ],
+          'msvs_disabled_warnings': [4133],
           'sources': [
             'src/config-win32.h',
             'src/windows_port.c',

deps/cares/src/ares_create_query.c

@@ -16,6 +16,11 @@
 
 #include "ares_setup.h"
 
+#ifndef _WIN32
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warray-bounds"
+#endif
+
 #ifdef HAVE_NETINET_IN_H
 #  include <netinet/in.h>
 #endif
@@ -206,3 +211,7 @@ int ares_create_query(const char *name, int dnsclass, int type,
 
   return ARES_SUCCESS;
 }
+
+#ifndef _WIN32
+#pragma clang diagnostic pop
+#endif

deps/cares/src/ares_process.c

@@ -460,7 +460,7 @@ static void read_udp_packets(ares_channel channel, fd_set *read_fds,
           else
             fromlen = sizeof(from.sa6);
           count = (ssize_t)recvfrom(server->udp_socket, (void *)buf,
-                                    sizeof(buf), 0, &from.sa, &fromlen);
+                                    sizeof(buf), 0, &from.sa, (socklen_t *)&fromlen);
 #else
           count = sread(server->udp_socket, buf, sizeof(buf));
 #endif

deps/http_parser/http_parser.c

@@ -2391,7 +2391,7 @@ http_parser_parse_url(const char *buf, size_t buflen, int is_connect,
         break;
 
       default:
-        assert(!"Unexpected state");
+        assert(0 && "Unexpected state");
         return 1;
     }
 

deps/http_parser/http_parser.gyp

@@ -13,20 +13,10 @@
       'Debug': {
         'defines': [ 'DEBUG', '_DEBUG' ],
         'cflags': [ '-Wall', '-Wextra', '-O0', '-g', '-ftrapv' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'RuntimeLibrary': 1, # static debug
-          },
-        },
       },
       'Release': {
         'defines': [ 'NDEBUG' ],
         'cflags': [ '-Wall', '-Wextra', '-O3' ],
-        'msvs_settings': {
-          'VCCLCompilerTool': {
-            'RuntimeLibrary': 0, # static release
-          },
-        },
       }
     },
     'msvs_settings': {
@@ -39,6 +29,9 @@
       },
     },
     'conditions': [
+      ['clang==1', {
+        'cflags': ['-Wno-error=string-conversion'],
+      }],
       ['OS == "win"', {
         'defines': [
           'WIN32'

deps/openssl/openssl.gyp

@@ -4,18 +4,22 @@
 
 {
   'variables': {
-    'is_clang': 0,
+    'is_clang': 1,
     'gcc_version': 0,
     'openssl_no_asm%': 0,
     'llvm_version%': 0,
     'xcode_version%': 0,
     'gas_version%': 0,
-    'openssl_fips%': 'false',
+    'openssl_fips%': '',
+    'node_byteorder%': 'little',
+    'conditions': [
+      ['OS=="mac"', { 'openssl_no_asm%': 1 } ],
+    ],
   },
   'targets': [
     {
       'target_name': 'openssl',
-      'type': '<(library)',
+      'type': 'static_library',
       'includes': ['openssl.gypi'],
       'sources': ['<@(openssl_sources)'],
       'sources/': [
@@ -149,12 +153,15 @@
     'includes': ['openssl.gypi'],
     'include_dirs': ['<@(openssl_default_include_dirs)'],
     'defines': ['<@(openssl_default_defines_all)'],
+    'cflags!': ['-fvisibility=hidden'],
+    'cflags_cc!': ['-fvisibility-inlines-hidden'],
     'conditions': [
       ['OS=="win"', {
         'defines': ['<@(openssl_default_defines_win)'],
         'link_settings': {
           'libraries': ['<@(openssl_default_libraries_win)'],
         },
+        'msvs_disabled_warnings': [4311],
       }, {
         'defines': ['<@(openssl_default_defines_not_win)'],
         'cflags': ['-Wno-missing-field-initializers'],
@@ -167,7 +174,7 @@
         ]
       }],
       ['is_clang==1 or gcc_version>=43', {
-        'cflags': ['-Wno-old-style-declaration'],
+        'cflags': ['-Wno-error=unused-command-line-argument', '-Wno-error=parentheses-equality'],
       }],
       ['OS=="solaris"', {
         'defines': ['__EXTENSIONS__'],

deps/openssl/openssl/ssl/d1_srvr.c

@@ -126,6 +126,7 @@
 # include <openssl/dh.h>
 #endif
 
+
 static const SSL_METHOD *dtls1_get_server_method(int ver);
 static int dtls1_send_hello_verify_request(SSL *s);
 

deps/openssl/openssl/ssl/s3_srvr.c

@@ -170,6 +170,7 @@
 #endif
 #include <openssl/md5.h>
 
+
 #ifndef OPENSSL_NO_SSL3_METHOD
 static const SSL_METHOD *ssl3_get_server_method(int ver);
 

deps/uv/include/uv.h

@@ -28,6 +28,8 @@ extern "C" {
 #endif
 
 #ifdef _WIN32
+#pragma warning(push)
+#pragma warning(disable: 4201)
   /* Windows - set up dll import/export decorators. */
 # if defined(BUILDING_UV_SHARED)
     /* Building shared library. */
@@ -766,6 +768,9 @@ UV_EXTERN int uv_async_init(uv_loop_t*,
                             uv_async_t* async,
                             uv_async_cb async_cb);
 UV_EXTERN int uv_async_send(uv_async_t* async);
+#ifdef _WIN32
+UV_EXTERN int uv_async_send_nw(uv_async_t* async);
+#endif
 
 
 /*
@@ -1465,6 +1470,7 @@ struct uv_loop_s {
   void* active_reqs[2];
   /* Internal flag to signal loop stop. */
   unsigned int stop_flag;
+  void* keventfunc;
   UV_LOOP_PRIVATE_FIELDS
 };
 
@@ -1489,6 +1495,10 @@ struct uv_loop_s {
 #undef UV_LOOP_PRIVATE_FIELDS
 #undef UV_LOOP_PRIVATE_PLATFORM_FIELDS
 
+#ifdef _WIN32
+#pragma warning(pop)
+#endif
+
 #ifdef __cplusplus
 }
 #endif

deps/uv/src/unix/fs.c

@@ -46,6 +46,9 @@
 #include <utime.h>
 #include <poll.h>
 
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Warray-bounds"
+
 #if defined(__DragonFly__)  ||                                            \
     defined(__FreeBSD__)    ||                                            \
     defined(__OpenBSD__)    ||                                            \
@@ -1322,3 +1325,4 @@ void uv_fs_req_cleanup(uv_fs_t* req) {
     uv__free(req->ptr);
   req->ptr = NULL;
 }
+#pragma clang diagnostic pop

deps/uv/src/unix/getaddrinfo.c

@@ -88,7 +88,7 @@ int uv__getaddrinfo_translate_error(int sys_err) {
   case EAI_SYSTEM: return -errno;
 #endif
   }
-  assert(!"unknown EAI_* error code");
+  assert(!(int)("unknown EAI_* error code"));
   abort();
   return 0;  /* Pacify compiler. */
 }

deps/uv/src/unix/kqueue.c

@@ -36,6 +36,8 @@
 
 static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags);
 
+typedef  int (*keventfunc_t)(int kq, const struct kevent *changelist, int nchanges,
+                    struct kevent *eventlist, int nevents, const struct timespec *timeout);
 
 int uv__kqueue_init(uv_loop_t* loop) {
   loop->backend_fd = kqueue();
@@ -87,6 +89,8 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
   int op;
   int i;
 
+  keventfunc_t keventfunc = loop->keventfunc ? (keventfunc_t)loop->keventfunc : &kevent;
+
   if (loop->nfds == 0) {
     assert(QUEUE_EMPTY(&loop->watcher_queue));
     return;
@@ -119,7 +123,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
       EV_SET(events + nevents, w->fd, filter, op, fflags, 0, 0);
 
       if (++nevents == ARRAY_SIZE(events)) {
-        if (kevent(loop->backend_fd, events, nevents, NULL, 0, NULL))
+        if (keventfunc(loop->backend_fd, events, nevents, NULL, 0, NULL))
           abort();
         nevents = 0;
       }
@@ -129,7 +133,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
       EV_SET(events + nevents, w->fd, EVFILT_WRITE, EV_ADD, 0, 0, 0);
 
       if (++nevents == ARRAY_SIZE(events)) {
-        if (kevent(loop->backend_fd, events, nevents, NULL, 0, NULL))
+        if (keventfunc(loop->backend_fd, events, nevents, NULL, 0, NULL))
           abort();
         nevents = 0;
       }
@@ -158,7 +162,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
     if (pset != NULL)
       pthread_sigmask(SIG_BLOCK, pset, NULL);
 
-    nfds = kevent(loop->backend_fd,
+    nfds = keventfunc(loop->backend_fd,
                   events,
                   nevents,
                   events,
@@ -175,7 +179,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
     SAVE_ERRNO(uv__update_time(loop));
 
     if (nfds == 0) {
-      assert(timeout != -1);
+      //assert(timeout != -1);
       return;
     }
 
@@ -213,7 +217,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
         struct kevent events[1];
 
         EV_SET(events + 0, fd, ev->filter, EV_DELETE, 0, 0, 0);
-        if (kevent(loop->backend_fd, events, 1, NULL, 0, NULL))
+        if (keventfunc(loop->backend_fd, events, 1, NULL, 0, NULL))
           if (errno != EBADF && errno != ENOENT)
             abort();
 
@@ -238,7 +242,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
           /* TODO batch up */
           struct kevent events[1];
           EV_SET(events + 0, fd, ev->filter, EV_DELETE, 0, 0, 0);
-          if (kevent(loop->backend_fd, events, 1, NULL, 0, NULL))
+          if (keventfunc(loop->backend_fd, events, 1, NULL, 0, NULL))
             if (errno != ENOENT)
               abort();
         }
@@ -252,7 +256,7 @@ void uv__io_poll(uv_loop_t* loop, int timeout) {
           /* TODO batch up */
           struct kevent events[1];
           EV_SET(events + 0, fd, ev->filter, EV_DELETE, 0, 0, 0);
-          if (kevent(loop->backend_fd, events, 1, NULL, 0, NULL))
+          if (keventfunc(loop->backend_fd, events, 1, NULL, 0, NULL))
             if (errno != ENOENT)
               abort();
         }
@@ -342,7 +346,8 @@ static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags) {
   /* MAXPATHLEN == PATH_MAX but the former is what XNU calls it internally. */
   char pathbuf[MAXPATHLEN];
 #endif
-
+  keventfunc_t keventfunc = loop->keventfunc ? (keventfunc_t)loop->keventfunc : &kevent;
+
   handle = container_of(w, uv_fs_event_t, event_watcher);
 
   if (fflags & (NOTE_ATTRIB | NOTE_EXTEND))
@@ -370,7 +375,7 @@ static void uv__fs_event(uv_loop_t* loop, uv__io_t* w, unsigned int fflags) {
 
   EV_SET(&ev, w->fd, EVFILT_VNODE, EV_ADD | EV_ONESHOT, fflags, 0, 0);
 
-  if (kevent(loop->backend_fd, &ev, 1, NULL, 0, NULL))
+  if (keventfunc(loop->backend_fd, &ev, 1, NULL, 0, NULL))
     abort();
 }
 

deps/uv/src/unix/loop.c

@@ -56,6 +56,8 @@ int uv_loop_init(uv_loop_t* loop) {
   loop->backend_fd = -1;
   loop->emfile_fd = -1;
 
+  loop->keventfunc = NULL;
+
   loop->timer_counter = 0;
   loop->stop_flag = 0;