fix: [m67] patch leveldb to not redefine ssize_t (#682)

electron · Sep 11, 2018 · 5d57adf · 5d57adf
1 parent 00475d4
commit 5d57adf
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/patches/common/chromium/.patches.yaml b/patches/common/chromium/.patches.yaml
@@ -463,3 +463,10 @@ patches:
   file: ssl_security_state_tab_helper.patch
   description: |
     Allows populating security tab info for devtools in Electron.
+-
+  author: Jeremy Apthorp <jeremya@chromium.org>
+  file: leveldb_ssize_t.patch
+  description: |
+    Fix conflict between leveldb & node's definition of ssize_t on
+    Windows by preventing leveldb from re-defining the type if it's
+    already defined.
diff --git a/patches/common/chromium/leveldb_ssize_t.patch b/patches/common/chromium/leveldb_ssize_t.patch
@@ -0,0 +1,16 @@
+diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h
+index a7c449eba19c..acbce7efd582 100644
+--- a/third_party/leveldatabase/port/port_chromium.h
++++ b/third_party/leveldatabase/port/port_chromium.h
+@@ -26,7 +26,11 @@
+ #endif
+
+ #if defined(OS_WIN)
++#  if !defined(_SSIZE_T_) && !defined(_SSIZE_T_DEFINED)
+ typedef SSIZE_T ssize_t;
++#  define _SSIZE_T_
++#  define _SSIZE_T_DEFINED
++#  endif
+ #endif
+
+ namespace leveldb {