aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMiodrag Milanović <mmicko@gmail.com>2019-10-05 07:48:30 +0200
committerGitHub <noreply@github.com>2019-10-05 07:48:30 +0200
commit7c074ef844ba8bae69f7994e3fd48bf99e09c53b (patch)
tree8432472a7fa161d855c9250ae8d5ba66710a3dd9
parentb47bb5c8100bf24c7075dc322f201779eda280b7 (diff)
parentc0b14cfea7c5650ddbc28d69de4749f845954dc7 (diff)
downloadyosys-7c074ef844ba8bae69f7994e3fd48bf99e09c53b.tar.gz
yosys-7c074ef844ba8bae69f7994e3fd48bf99e09c53b.tar.bz2
yosys-7c074ef844ba8bae69f7994e3fd48bf99e09c53b.zip
Merge pull request #1436 from YosysHQ/mmicko/msvc_fix
Fixes for MSVC build
-rw-r--r--frontends/rpc/rpc_frontend.cc8
-rw-r--r--passes/pmgen/xilinx_dsp.cc1
2 files changed, 7 insertions, 2 deletions
diff --git a/frontends/rpc/rpc_frontend.cc b/frontends/rpc/rpc_frontend.cc
index 83e1353b0..add17c243 100644
--- a/frontends/rpc/rpc_frontend.cc
+++ b/frontends/rpc/rpc_frontend.cc
@@ -28,14 +28,13 @@
#include <sys/wait.h>
#include <sys/socket.h>
#include <sys/un.h>
+extern char **environ;
#endif
#include "libs/json11/json11.hpp"
#include "libs/sha1/sha1.h"
#include "kernel/yosys.h"
-extern char **environ;
-
YOSYS_NAMESPACE_BEGIN
#if defined(_WIN32)
@@ -238,6 +237,11 @@ struct RpcModule : RTLIL::Module {
#if defined(_WIN32)
+#if defined(_MSC_VER)
+#include <BaseTsd.h>
+typedef SSIZE_T ssize_t;
+#endif
+
struct HandleRpcServer : RpcServer {
HANDLE hsend, hrecv;
diff --git a/passes/pmgen/xilinx_dsp.cc b/passes/pmgen/xilinx_dsp.cc
index 11c7e5ea8..3ff921957 100644
--- a/passes/pmgen/xilinx_dsp.cc
+++ b/passes/pmgen/xilinx_dsp.cc
@@ -20,6 +20,7 @@
#include "kernel/yosys.h"
#include "kernel/sigtools.h"
+#include <deque>
USING_YOSYS_NAMESPACE
PRIVATE_NAMESPACE_BEGIN