82 lines
2.5 KiB
Diff
82 lines
2.5 KiB
Diff
|
--- sidplay-libs-2.1.1.orig/libsidplay/include/sidplay/SmartPtr.h 2004-06-14 22:08:04.000000000 +0200
|
||
|
|
+++ sidplay-libs-2.1.1/libsidplay/include/sidplay/SmartPtr.h 2012-07-21 14:45:52.792511196 +0200
|
||
|
|
@@ -17,16 +17,16 @@
|
||
|
|
doFree = bufOwner;
|
||
|
|
if ( bufferLen >= 1 )
|
||
|
|
{
|
||
|
|
- pBufCurrent = ( bufBegin = buffer );
|
||
|
|
- bufEnd = bufBegin + bufferLen;
|
||
|
|
- bufLen = bufferLen;
|
||
|
|
- status = true;
|
||
|
|
+ this->pBufCurrent = ( this->bufBegin = buffer );
|
||
|
|
+ this->bufEnd = this->bufBegin + 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;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -211,16 +211,16 @@
|
||
|
|
{
|
||
|
|
if ( bufferLen >= 1 )
|
||
|
|
{
|
||
|
|
- pBufCurrent = ( bufBegin = buffer );
|
||
|
|
- bufEnd = bufBegin + bufferLen;
|
||
|
|
- bufLen = bufferLen;
|
||
|
|
- status = true;
|
||
|
|
+ this->pBufCurrent = ( this->bufBegin = buffer );
|
||
|
|
+ this->bufEnd = this->bufBegin + 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;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
};
|
||
|
|
diff -Nru sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid-builder.cpp sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp
|
||
|
|
--- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid-builder.cpp 2004-06-14 22:07:58.000000000 +0200
|
||
|
|
+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid-builder.cpp 2012-07-21 14:53:01.984530391 +0200
|
||
|
|
@@ -37,6 +37,7 @@
|
||
|
|
***************************************************************************/
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
+#include <cstring>
|
||
|
|
|
||
|
|
#include "config.h"
|
||
|
|
#ifdef HAVE_EXCEPTIONS
|
||
|
|
--- sidplay-libs-2.1.1.orig/builders/resid-builder/src/resid.cpp 2004-06-14 22:07:58.000000000 +0200
|
||
|
|
+++ sidplay-libs-2.1.1/builders/resid-builder/src/resid.cpp 2012-07-21 14:56:06.034321868 +0200
|
||
|
|
@@ -17,6 +17,7 @@
|
||
|
|
***************************************************************************/
|
||
|
|
|
||
|
|
#include "config.h"
|
||
|
|
+#include <cstring>
|
||
|
|
|
||
|
|
#ifdef HAVE_EXCEPTIONS
|
||
|
|
# include <new>
|
||
|
|
--- sidplay-libs-2.1.1.orig/builders/hardsid-builder/src/hardsid-builder.cpp 2004-06-14 22:07:57.000000000 +0200
|
||
|
|
+++ sidplay-libs-2.1.1/builders/hardsid-builder/src/hardsid-builder.cpp 2012-07-21 14:57:59.891241940 +0200
|
||
|
|
@@ -48,6 +48,7 @@
|
||
|
|
|
||
|
|
#include <stdio.h>
|
||
|
|
#include "config.h"
|
||
|
|
+#include <cstring>
|
||
|
|
|
||
|
|
#ifdef HAVE_EXCEPTIONS
|
||
|
|
# include <new>
|