Index: head/audio/dream/files/patch-src_GUI-QT_LiveScheduleDlg.h =================================================================== --- head/audio/dream/files/patch-src_GUI-QT_LiveScheduleDlg.h (nonexistent) +++ head/audio/dream/files/patch-src_GUI-QT_LiveScheduleDlg.h (revision 409574) @@ -0,0 +1,11 @@ +--- src/GUI-QT/LiveScheduleDlg.h.orig 2013-11-11 16:33:43 UTC ++++ src/GUI-QT/LiveScheduleDlg.h +@@ -26,7 +26,7 @@ + \******************************************************************************/ + + #ifndef __LiveScheduleDlg_H +-#define LiveScheduleDlg_H ++#define __LiveScheduleDlg_H + + #include "ui_LiveScheduleWindow.h" + #include "CWindow.h" Property changes on: head/audio/dream/files/patch-src_GUI-QT_LiveScheduleDlg.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp =================================================================== --- head/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp (nonexistent) +++ head/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp (revision 409574) @@ -0,0 +1,29 @@ +--- src/matlib/MatlibStdToolbox.cpp.orig 2016-02-26 02:12:16 UTC ++++ src/matlib/MatlibStdToolbox.cpp +@@ -28,11 +28,11 @@ + #include "MatlibStdToolbox.h" + #include "../GlobalDefinitions.h" + +-/* The mutex need to be application wide, ++/* The dream_mutex need to be application wide, + only the execution routines are thread-safe */ +-static CMutex* mutex = NULL; +-#define MUTEX_LOCK() mutex->Lock() +-#define MUTEX_UNLOCK() mutex->Unlock() ++static CMutex* dream_mutex = NULL; ++#define MUTEX_LOCK() dream_mutex->Lock() ++#define MUTEX_UNLOCK() dream_mutex->Unlock() + + # define PLANNER_FLAGS (FFTW_ESTIMATE | FFTW_DESTROY_INPUT) + /* Warning: for testing purpose only */ +@@ -669,8 +669,8 @@ CFftPlans::CFftPlans(const int iFftSize) + bInitialized(FALSE), bFixedSizeInit(FALSE), fftw_n(0) + { + /* Static initialization of CMutex not working on Mac OS X */ +- if (!mutex) +- mutex = new CMutex(); ++ if (!dream_mutex) ++ dream_mutex = new CMutex(); + + /* If iFftSize is non zero then proceed to initialization */ + if (iFftSize) Property changes on: head/audio/dream/files/patch-src_matlib_MatlibStdToolbox.cpp ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +1 \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property