From d88d3a620b424afad1a1cb92b2d9fc421c947e53 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:22:32 +0000
Subject: include <strings.h>


diff --git a/src/compression/zziplib/generic/file.cpp b/src/compression/zziplib/generic/file.cpp
index 4c691ec..b64ca65 100644
--- a/src/compression/zziplib/generic/file.cpp
+++ b/src/compression/zziplib/generic/file.cpp
@@ -15,6 +15,7 @@
 #include <zzip_file.h>
 
 #include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <stdlib.h>
diff --git a/src/compression/zziplib/generic/stat.cpp b/src/compression/zziplib/generic/stat.cpp
index 0759a82..133c858 100644
--- a/src/compression/zziplib/generic/stat.cpp
+++ b/src/compression/zziplib/generic/stat.cpp
@@ -20,6 +20,7 @@
 #include <zzip_lib.h>                                   /* exported...*/
 #include <zzip_file.h>
 #include <string.h>
+#include <strings.h>
 #include <sys/stat.h>
 
 #define ZZIP_USE_INTERNAL
diff --git a/src/ppui/BasicTypes.h b/src/ppui/BasicTypes.h
index 23ab385..831c284 100644
--- a/src/ppui/BasicTypes.h
+++ b/src/ppui/BasicTypes.h
@@ -43,7 +43,7 @@ typedef signed int		pp_int32;
 	#include <stdio.h>
 	#include <stdlib.h>
 	#include <string.h>
-	#include <string.h>
+	#include <strings.h>
 	#include "VirtualKeys.h"
 	#include "PPSystemString_POSIX.h"
 #endif
-- 
1.8.3.4


From f282da166a53186366e41fdc66804fd792fa8ee6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Wed, 3 Sep 2014 16:47:15 +0000
Subject: link against libstdc++


diff --git a/platforms/haiku/Jamfiles/src-tracker-Jamfile b/platforms/haiku/Jamfiles/src-tracker-Jamfile
index 39e0412..16b1ef0 100644
--- a/platforms/haiku/Jamfiles/src-tracker-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-Jamfile
@@ -11,7 +11,7 @@ SubDirHdrs $(PathPPUI) haiku ;
 SubDirHdrs $(PathTracker) haiku ;
 SubDirHdrs - ;
 
-LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker ;
+LINKLIBS on MilkyTracker = -lbe -lgame -lmedia -lmidi2 -ltextencoding -ltracker -lstdc++ ;
 
 LinkLibraries MilkyTracker :
 	libcompression
diff --git a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
index 662ee18..74f80dc 100644
--- a/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
+++ b/platforms/haiku/Jamfiles/src-tracker-haiku-MilkySettings-Jamfile
@@ -1,6 +1,6 @@
 SubDir TOP src tracker haiku MilkySettings ;
 
-LINKLIBS on MilkySettings = -lbe -lmidi2 ;
+LINKLIBS on MilkySettings = -lbe -lmidi2 -lstdc++ ;
 
 Main MilkySettings :
 	MilkySettingsApplication.cpp
-- 
1.8.3.4