From adf599e942d73b1892743059f942b8f3b969700a Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Mon, 19 May 2008 13:57:07 +0000
Subject: [PATCH]

---
 .../macosx/platform_specific_code/juce_mac_SystemStats.cpp | 3 +++
 .../platform_specific_code/juce_mac_WebBrowserComponent.mm | 3 ++-
 src/juce_core/text/juce_String.cpp                         | 7 +++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/build/macosx/platform_specific_code/juce_mac_SystemStats.cpp b/build/macosx/platform_specific_code/juce_mac_SystemStats.cpp
index eb5183c848..c6953908f8 100644
--- a/build/macosx/platform_specific_code/juce_mac_SystemStats.cpp
+++ b/build/macosx/platform_specific_code/juce_mac_SystemStats.cpp
@@ -30,6 +30,7 @@
 */
 
 #include "../../../src/juce_core/basics/juce_StandardHeader.h"
+#include <AppKit/AppKit.h>
 #include <Carbon/Carbon.h>
 #include <CoreAudio/HostTime.h>
 #include <ctime>
@@ -145,6 +146,8 @@ void SystemStats::initialiseStats() throw()
     {
         initialised = true;
 
+        NSApplicationLoad();
+
 #if JUCE_INTEL
         {
             unsigned int familyModel, extFeatures;
diff --git a/build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm b/build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm
index 88779f1988..67515ab0d4 100644
--- a/build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm
+++ b/build/macosx/platform_specific_code/juce_mac_WebBrowserComponent.mm
@@ -32,6 +32,7 @@
 #include "../../../src/juce_core/basics/juce_StandardHeader.h"
 
 #include <Cocoa/Cocoa.h>
+#include <WebKit/WebKit.h>
 #include <WebKit/HIWebView.h>
 #include <WebKit/WebPolicyDelegate.h>
 #include <WebKit/CarbonUtils.h>
@@ -226,7 +227,7 @@ public:
 
     void stop()
     {
-        [webView stopLoading];
+        [webView stopLoading: nil];
     }
 
     void updateBounds()
diff --git a/src/juce_core/text/juce_String.cpp b/src/juce_core/text/juce_String.cpp
index 8082959bbe..5015efec9c 100644
--- a/src/juce_core/text/juce_String.cpp
+++ b/src/juce_core/text/juce_String.cpp
@@ -1281,7 +1281,14 @@ void String::vprintf (const tchar* const pf, va_list& args) throw()
 
     do
     {
+#if JUCE_LINUX && JUCE_64BIT
+        va_list tempArgs;
+        va_copy (tempArgs, args);
+        const int num = CharacterFunctions::vprintf (buf, bufSize - 1, pf, tempArgs);
+        va_end (tempArgs);
+#else
         const int num = CharacterFunctions::vprintf (buf, bufSize - 1, pf, args);
+#endif
 
         if (num > 0)
         {