2018-09-21 00:30:26 +00:00
|
|
|
From 070bbbe44c20c52f5e12b04b01fc101a42633119 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Jeremy Apthorp <jeremya@chromium.org>
|
|
|
|
|
Date: Thu, 20 Sep 2018 17:50:38 -0700
|
|
|
|
|
Subject: leveldb_ssize_t.patch
|
|
|
|
|
|
|
|
|
|
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.
|
|
|
|
|
|
2018-09-14 18:03:43 +00:00
|
|
|
diff --git a/third_party/leveldatabase/port/port_chromium.h b/third_party/leveldatabase/port/port_chromium.h
|
2018-09-14 05:02:16 +00:00
|
|
|
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 {
|
2018-09-21 00:30:26 +00:00
|
|
|
--
|
|
|
|
|
2.17.0
|
|
|
|
|
|
