From e36164c76b2171e0726aec0bca268dd80c607504 Mon Sep 17 00:00:00 2001
From: tamasmeszaros <meszaros.q@gmail.com>
Date: Tue, 22 May 2018 10:15:15 +0200
Subject: [PATCH] OSX and linux build fixes

---
 xs/src/libslic3r/Print.cpp                 | 3 ++-
 xs/src/libslic3r/Rasterizer/Rasterizer.cpp | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/xs/src/libslic3r/Print.cpp b/xs/src/libslic3r/Print.cpp
index 8416dd979e..3127d5fa63 100644
--- a/xs/src/libslic3r/Print.cpp
+++ b/xs/src/libslic3r/Print.cpp
@@ -1334,7 +1334,8 @@ public:
     }
 
     inline void beginLayer() {
-        layers_rst_.emplace_back(Raster(res_, pxdim_), std::stringstream());
+        layers_rst_.emplace_back();
+        layers_rst_.front().first.reset(res_, pxdim_);
     }
 
     inline void finishLayer(unsigned lyr_id) {
diff --git a/xs/src/libslic3r/Rasterizer/Rasterizer.cpp b/xs/src/libslic3r/Rasterizer/Rasterizer.cpp
index 71d0c8ef35..a7b123d64c 100644
--- a/xs/src/libslic3r/Rasterizer/Rasterizer.cpp
+++ b/xs/src/libslic3r/Rasterizer/Rasterizer.cpp
@@ -16,7 +16,7 @@
 #include <agg/agg_path_storage.h>
 
 // For png compression
-#ifdef WIN32
+#if defined(WIN32) || defined(__APPLE__ )
 inline char *strerror_r(int errnum, char *buf, size_t buflen) {
     strerror_s(buf, buflen, errnum);
     return buf;