From 5d57adf519926382355a339649bcd54f76c41b24 Mon Sep 17 00:00:00 2001 From: Jeremy Apthorp Date: Mon, 10 Sep 2018 10:12:11 -0700 Subject: [PATCH] fix: [m67] patch leveldb to not redefine ssize_t (#682) --- patches/common/chromium/.patches.yaml | 7 +++++++ patches/common/chromium/leveldb_ssize_t.patch | 16 ++++++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 patches/common/chromium/leveldb_ssize_t.patch diff --git a/patches/common/chromium/.patches.yaml b/patches/common/chromium/.patches.yaml index 3da34838..338e5649 100644 --- 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 + 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 new file mode 100644 index 00000000..0867c6ad --- /dev/null +++ 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 {