[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[darin at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 2764901b43b98c2bc21de156e10be3c12e8e1c8d
Author: darin at apple.com <darin at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 4 19:11:22 2011 +0000

    Try to fix Windows build.
    
    * wtf/ThreadingWin.cpp: Added include of PassOwnPtr.h. Fixed paragraphing
    of conditional includes.
    (WTF::wtfThreadEntryPoint): Use -> instead of . to dereference pointer.
    (WTF::createThreadInternal): Tweaked #if to not need separate macro.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74977 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 54a00f1..29e8e84 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2011-01-04  Darin Adler  <darin at apple.com>
+
+        Try to fix Windows build.
+
+        * wtf/ThreadingWin.cpp: Added include of PassOwnPtr.h. Fixed paragraphing
+        of conditional includes.
+        (WTF::wtfThreadEntryPoint): Use -> instead of . to dereference pointer.
+        (WTF::createThreadInternal): Tweaked #if to not need separate macro.
+
 2011-01-04  Daniel Bates  <dbates at rim.com>
 
         Reviewed by Adam Roben.
diff --git a/Source/JavaScriptCore/wtf/ThreadingWin.cpp b/Source/JavaScriptCore/wtf/ThreadingWin.cpp
index d5cf528..3e9df2c 100644
--- a/Source/JavaScriptCore/wtf/ThreadingWin.cpp
+++ b/Source/JavaScriptCore/wtf/ThreadingWin.cpp
@@ -88,23 +88,25 @@
 
 #include "MainThread.h"
 #include "ThreadFunctionInvocation.h"
+#include <windows.h>
+#include <wtf/CurrentTime.h>
+#include <wtf/HashMap.h>
+#include <wtf/MathExtras.h>
+#include <wtf/OwnPtr.h>
+#include <wtf/PassOwnPtr.h>
+#include <wtf/RandomNumberSeed.h>
+
 #if !USE(PTHREADS) && OS(WINDOWS)
 #include "ThreadSpecific.h"
 #endif
+
 #if !OS(WINCE)
 #include <process.h>
 #endif
+
 #if HAVE(ERRNO_H)
 #include <errno.h>
-#else
-#define NO_ERRNO
 #endif
-#include <windows.h>
-#include <wtf/CurrentTime.h>
-#include <wtf/HashMap.h>
-#include <wtf/MathExtras.h>
-#include <wtf/OwnPtr.h>
-#include <wtf/RandomNumberSeed.h>
 
 namespace WTF {
 
@@ -192,7 +194,7 @@ static void clearThreadHandleForIdentifier(ThreadIdentifier id)
 static unsigned __stdcall wtfThreadEntryPoint(void* param)
 {
     OwnPtr<ThreadFunctionInvocation> invocation = adoptPtr(static_cast<ThreadFunctionInvocation*>(param));
-    void* result = invocation->function(invocation.data);
+    void* result = invocation->function(invocation->data);
 
 #if !USE(PTHREADS) && OS(WINDOWS)
     // Do the TLS cleanup.
@@ -217,7 +219,7 @@ ThreadIdentifier createThreadInternal(ThreadFunction entryPoint, void* data, con
     if (!threadHandle) {
 #if OS(WINCE)
         LOG_ERROR("Failed to create thread at entry point %p with data %p: %ld", entryPoint, data, ::GetLastError());
-#elif defined(NO_ERRNO)
+#elif !HAVE(ERRNO_H)
         LOG_ERROR("Failed to create thread at entry point %p with data %p.", entryPoint, data);
 #else
         LOG_ERROR("Failed to create thread at entry point %p with data %p: %ld", entryPoint, data, errno);

-- 
WebKit Debian packaging