summaryrefslogtreecommitdiffstats
path: root/abs/extra-testing/xulrunner/nsThreadUtils.patch
diff options
context:
space:
mode:
authorGreg Frost <gregfrost1@bigpond.com>2009-07-29 09:29:30 (GMT)
committerGreg Frost <gregfrost1@bigpond.com>2009-07-29 09:29:30 (GMT)
commit4159bd66e3adbf81679c68dfbe6a01486a3f53db (patch)
tree01bd3c6700bce3d19f053d900598cac1df63fcb9 /abs/extra-testing/xulrunner/nsThreadUtils.patch
parentfd40ea704a335d923d7af765add1b3bad1ee5a9d (diff)
downloadlinhes_pkgbuild-4159bd66e3adbf81679c68dfbe6a01486a3f53db.zip
linhes_pkgbuild-4159bd66e3adbf81679c68dfbe6a01486a3f53db.tar.gz
linhes_pkgbuild-4159bd66e3adbf81679c68dfbe6a01486a3f53db.tar.bz2
firefox3.5.1upgrade: firefox nss nspr sqlite3 xulrunner
Diffstat (limited to 'abs/extra-testing/xulrunner/nsThreadUtils.patch')
-rw-r--r--abs/extra-testing/xulrunner/nsThreadUtils.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/abs/extra-testing/xulrunner/nsThreadUtils.patch b/abs/extra-testing/xulrunner/nsThreadUtils.patch
deleted file mode 100644
index 69609c0..0000000
--- a/abs/extra-testing/xulrunner/nsThreadUtils.patch
+++ /dev/null
@@ -1,42 +0,0 @@
---- xulrunner-1.9.0.4.orig/xpcom/glue/nsThreadUtils.cpp
-+++ xulrunner-1.9.0.4/xpcom/glue/nsThreadUtils.cpp
-@@ -187,24 +187,27 @@
- }
- #endif // XPCOM_GLUE_AVOID_NSPR
-
-+inline PRBool
-+hasPendingEvents(nsIThread *thread)
-+{
-+ PRBool val;
-+ return NS_SUCCEEDED(thread->HasPendingEvents(&val)) && val;
-+}
-+
- PRBool
- NS_HasPendingEvents(nsIThread *thread)
- {
--#ifdef MOZILLA_INTERNAL_API
- if (!thread) {
-+#ifndef MOZILLA_INTERNAL_API
-+ nsCOMPtr<nsIThread> current;
-+ NS_GetCurrentThread(getter_AddRefs(current));
-+ return hasPendingEvents(current);
-+#else
- thread = NS_GetCurrentThread();
- NS_ENSURE_TRUE(thread, PR_FALSE);
-- }
--#else
-- nsCOMPtr<nsIThread> current;
-- if (!thread) {
-- NS_GetCurrentThread(getter_AddRefs(current));
-- NS_ENSURE_TRUE(current, PR_FALSE);
-- thread = current.get();
-- }
- #endif
-- PRBool val;
-- return NS_SUCCEEDED(thread->HasPendingEvents(&val)) && val;
-+ }
-+ return hasPendingEvents(thread);
- }
-
- PRBool
-