Merging the following javaxpcom+xulrunner bugs to the 1.8 branches: 302099, 305815, 315401, 272662, 316098, 316090, 320441, 320449, 320574, 317012, 315917, 311240 - all these bugs are either javaxpcom-only, xulrunner-only, or a=drivers (xpcom glue changes only which do not affect firefox/thunderbird)
git-svn-id: svn://10.0.0.236/branches/MOZILLA_1_8_BRANCH@187179 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -47,6 +47,7 @@
|
||||
#include "nsHashSets.h"
|
||||
#include "nsIWeakReference.h"
|
||||
#include <stdio.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#ifdef WIN32
|
||||
#define snprintf _snprintf
|
||||
@@ -106,7 +107,7 @@ public:
|
||||
|
||||
} else {
|
||||
|
||||
// In Javaconnect, we handle weak references internally; no need for the
|
||||
// In JavaXPCOM, we handle weak references internally; no need for the
|
||||
// |nsIWeakReference| interface. So just return |nsISupports|.
|
||||
if (iid->Equals(NS_GET_IID(nsIWeakReference))) {
|
||||
*aResult = (char*) nsMemory::Clone(isupp_str, sizeof(isupp_str));
|
||||
@@ -772,7 +773,7 @@ public:
|
||||
break;
|
||||
|
||||
case nsXPTType::T_VOID:
|
||||
rv = out->Write("int", 3, &count);
|
||||
rv = out->Write("long", 4, &count);
|
||||
break;
|
||||
|
||||
case nsXPTType::T_ARRAY:
|
||||
|
||||
Reference in New Issue
Block a user