compile error fixes

nwjs · Oct 27, 2016 · a2558c1 · a2558c1
1 parent eb2bc31
commit a2558c1
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/deps/cares/cares.gyp b/deps/cares/cares.gyp
@@ -115,7 +115,7 @@
         }],
         [ 'OS=="win"', {
           'include_dirs': [ 'config/win32' ],
-          'msvs_disabled_warnings': [4133],
+          'msvs_disabled_warnings': [4133, 4018],
           'sources': [
             'src/config-win32.h',
             'src/windows_port.c',

diff --git a/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S b/deps/openssl/asm/arm-void-gas/modes/ghash-armv4.S
@@ -3,11 +3,6 @@
 .text
 .code	32
 
-#ifdef __clang__
-#define ldrplb	ldrbpl
-#define ldrneb	ldrbne
-#endif
-
 .type	rem_4bit,%object
 .align	5
 rem_4bit:

diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp
@@ -174,7 +174,7 @@
         ]
       }],
       ['is_clang==1 or gcc_version>=43', {
-        #'cflags': ['-Wno-error=unused-command-line-argument', '-Wno-error=parentheses-equality'],
+        'cflags': ['-Wno-error=unused-command-line-argument', '-Wno-error=parentheses-equality', '-no-integrated-as'],
       }],
       ['OS=="solaris"', {
         'defines': ['__EXTENSIONS__'],