File sidplay-libs-2.1.1.dif of Package libsidplay

--- builders/hardsid-builder/include/sidplay/builders/hardsid.h
+++ builders/hardsid-builder/include/sidplay/builders/hardsid.h
@@ -36,6 +36,7 @@
 #define  _hardsid_h_
 
 #include <vector>
+#include <cstring>
 #include "sidplay/sidbuilder.h"
 
 
--- builders/hardsid-builder/src/hardsid-builder.cpp
+++ builders/hardsid-builder/src/hardsid-builder.cpp
@@ -376,6 +376,7 @@
             m_count = index;
     }
     closedir (dir);
+    return 0;
 }
 
 #endif // HAVE_MSWINDOWS
--- builders/resid-builder/Makefile.am
+++ builders/resid-builder/Makefile.am
@@ -1,4 +1,5 @@
 
+ACLOCAL_AMFLAGS = -I unix
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = unix include src
--- builders/resid-builder/include/sidplay/builders/resid.h
+++ builders/resid-builder/include/sidplay/builders/resid.h
@@ -23,6 +23,7 @@
  */
 
 #include <vector>
+#include <cstring>
 #include <sidplay/sidbuilder.h>
 #include <sidplay/event.h>
 
--- libsidplay/Makefile.am
+++ libsidplay/Makefile.am
@@ -1,4 +1,5 @@
 
+ACLOCAL_AMFLAGS = -I unix
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = unix include src
--- libsidplay/include/sidplay/SmartPtr.h
+++ libsidplay/include/sidplay/SmartPtr.h
@@ -211,16 +211,16 @@
 	{
 		if ( bufferLen >= 1 )
 		{
-			pBufCurrent = ( bufBegin = buffer );
-			bufEnd = bufBegin + bufferLen;
-			bufLen = bufferLen;
-			status = true;
+			this->pBufCurrent = ( this->bufBegin = buffer );
+			this->bufEnd = buffer + bufferLen;
+			this->bufLen = bufferLen;
+			this->status = true;
 		}
 		else
 		{
-			pBufCurrent = bufBegin = bufEnd = 0;
-			bufLen = 0;
-			status = false;
+			this->pBufCurrent = this->bufBegin = this->bufEnd = 0;
+			this->bufLen = 0;
+			this->status = false;
 		}
 	}
 };
--- libsidplay/include/sidplay/sidendian.h
+++ libsidplay/include/sidplay/sidendian.h
@@ -141,7 +141,7 @@
 // Convert high-byte and low-byte to 16-bit word.
 inline uint_least16_t endian_16 (uint8_t hi, uint8_t lo)
 {
-    uint_least16_t word;
+    uint_least16_t word = 0;
     endian_16lo8 (word, lo);
     endian_16hi8 (word, hi);
     return word;
--- libsidplay/unix/my_macros.m4
+++ libsidplay/unix/my_macros.m4
@@ -80,8 +80,8 @@
     AC_CACHE_VAL(test_cv_have_ios_binary,
     [
         AC_TRY_COMPILE(
-            [#include <fstream.h>],
-            [ifstream myTest(ios::in|ios::binary);],
+            [#include <fstream>],
+            [std::ifstream myTest(std::ios::in|std::ios::binary);],
             [test_cv_have_ios_binary=yes],
             [test_cv_have_ios_binary=no]
         )
@@ -105,9 +105,9 @@
     AC_CACHE_VAL(test_cv_have_ios_openmode,
     [
         AC_TRY_COMPILE(
-            [#include <fstream.h>
-             #include <iomanip.h>],
-            [ios::openmode myTest = ios::in;],
+            [#include <fstream>
+             #include <iomanip>],
+            [std::ios::openmode myTest = std::ios::in;],
             [test_cv_have_ios_openmode=yes],
             [test_cv_have_ios_openmode=no]
         )
@@ -131,7 +131,7 @@
     AC_CACHE_VAL(test_cv_have_exceptions,
     [
         AC_TRY_COMPILE(
-            [#include <new.h>],
+            [#include <new>],
             [char* buf = new(nothrow) char[1024];],
             [test_cv_have_exceptions=yes],
             [test_cv_have_exceptions=no]
--- libsidutils/Makefile.am
+++ libsidutils/Makefile.am
@@ -1,4 +1,5 @@
 
+ACLOCAL_AMFLAGS = -I unix
 AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = unix include src
--- libsidutils/include/sidplay/utils/SidUsage.h
+++ libsidutils/include/sidplay/utils/SidUsage.h
@@ -33,7 +33,7 @@
     uint_least16_t length;  // usage scan length
 
     // Copy common parts of basic usage to extended usage.
-    sid2_usage_t &sid2_usage_t::operator= (const sid_usage_t &usage)
+    sid2_usage_t &operator= (const sid_usage_t &usage)
     {
         *((sid_usage_t *) this) = usage;
         return *this;
--- resid/Makefile.am
+++ resid/Makefile.am
@@ -3,17 +3,17 @@
 resid_headers=siddefs.h sid.h voice.h wave.h envelope.h filter.h extfilt.h pot.h spline.h
 resid_sources=sid.cc voice.cc wave.cc envelope.cc filter.cc extfilt.cc pot.cc version.cc $(noinst_DATA:.dat=.cc)
 
-if INSTALL_RESID
+#if INSTALL_RESID
 lib_LTLIBRARIES = libresid.la
 pkginclude_HEADERS = $(resid_headers)
-else
-noinst_LTLIBRARIES = libresidc.la
-noinst_HEADERS = $(resid_headers)
-
-all-local:
-	ln -sf libresidc.la libresid.la
-
-endif
+#else
+#noinst_LTLIBRARIES = libresidc.la
+#noinst_HEADERS = $(resid_headers)
+#
+#all-local:
+#	ln -sf libresidc.la libresid.la
+#
+#endif
 
 ## Make sure these will be cleaned even when they're not built by
 ## default.