Never overflow the output buffer in wxBase64Decode().

[wxWidgets.git] / src / osx / carbon / sound.cpp

diff --git a/src/osx/carbon/sound.cpp b/src/osx/carbon/sound.cpp
index b3ff384fc86d9544d2b81cede45cca6357e8de31..38fb58f0b8c6c2b7d253f1edd5aa12a80c01186e 100644 (file)
--- a/src/osx/carbon/sound.cpp
+++ b/src/osx/carbon/sound.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/sound.cpp
+// Name:        src/osx/carbon/sound.cpp
 // Purpose:     wxSound class implementation: optional
 // Author:      Ryan Norton
 // Modified by: Stefan Csomor
@@ -45,13 +45,17 @@
 //
 
 #ifdef __WXMAC__
-#include "wx/mac/uma.h"
+#include "wx/osx/uma.h"
 #ifndef __DARWIN__
 #include <Movies.h>
 #include <Gestalt.h>
 #endif
 #endif
 
+#if wxOSX_USE_COCOA
+#include "wx/osx/private.h"
+#endif
+
 #include <Carbon/Carbon.h>
 
 //quicktime media layer only required for mac emulation on pc
@@ -231,7 +235,9 @@ inline bool wxInitQT ()
         int nError;
         //-2093 no dll
             if ((nError = InitializeQTML(0)) != noErr)
+            {
                 wxLogSysError(wxString::Format(wxT("Couldn't Initialize Quicktime-%i"), nError));
+            }
         #endif
         EnterMovies();
         return true;