use standard c++ includes to fix the build with clang

ok sthen@ naddy@
This commit is contained in:
jsg 2017-04-22 01:42:27 +00:00
parent e88696adbc
commit 43ae4036ec
3 changed files with 68 additions and 0 deletions

View File

@ -0,0 +1,25 @@
$OpenBSD: patch-sid2wav_cpp,v 1.1 2017/04/22 01:42:27 jsg Exp $
--- sid2wav.cpp.orig Thu Apr 20 16:59:16 2017
+++ sid2wav.cpp Thu Apr 20 16:59:52 2017
@@ -18,9 +18,9 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//
-#include <iostream.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iostream>
+#include <iomanip>
+#include <fstream>
#include <string.h>
#include <stdlib.h>
@@ -38,6 +38,8 @@
#include <sidplay/player.h>
#include <sidplay/fformat.h>
#include <sidplay/myendian.h>
+
+using namespace std;
const char s2w_version[] = "1.8";

View File

@ -0,0 +1,19 @@
$OpenBSD: patch-sidcon_cpp,v 1.1 2017/04/22 01:42:27 jsg Exp $
--- sidcon.cpp.orig Thu Apr 20 17:00:09 2017
+++ sidcon.cpp Thu Apr 20 17:00:34 2017
@@ -25,11 +25,13 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include <iostream.h>
-#include <iomanip.h>
+#include <iostream>
+#include <iomanip>
#include <sidplay/sidtune.h>
#include <sidplay/fformat.h>
+
+using namespace std;
static bool toPSID = true,
toSIDPLAY = false,

View File

@ -0,0 +1,24 @@
$OpenBSD: patch-sidplay_cpp,v 1.1 2017/04/22 01:42:27 jsg Exp $
--- sidplay.cpp.orig Thu Apr 20 16:54:28 2017
+++ sidplay.cpp Thu Apr 20 16:58:52 2017
@@ -18,8 +18,9 @@
//
#include <ctype.h>
-#include <iomanip.h>
-#include <fstream.h>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
#include <signal.h>
#include <stdlib.h>
#include <string.h>
@@ -29,6 +30,8 @@
#include <sidplay/fformat.h>
#include <sidplay/myendian.h>
#include "audiodrv.h"
+
+using namespace std;
#if defined(__amigaos__)
#define EXIT_ERROR_STATUS (20)