Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Bug 348426] Python extensions fail to build with libxul

Browse Source 
r=benjamin@smedbergs.us, sr=jst


git-svn-id: svn://10.0.0.236/trunk@213164 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mhammond%skippinet.com.au
2006-10-05 10:44:03 +00:00
parent 975a3fb3e5
commit d410bbfc5a
13 changed files with 90 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
mozilla/extensions/python/xpcom/src/VariantUtils.cpp
View File

@@ -49,10 +49,6 @@
// (c) 2000, ActiveState corp.
#include "PyXPCOM_std.h"
#include <nsIInterfaceInfoManager.h>
#include <nsAString.h>
#include <nsString.h>
#include <nsReadableUtils.h>
// ------------------------------------------------------------------------
// nsString utilities
@@ -116,16 +112,15 @@ PyObject_FromNSString( const nsACString &s, PRBool bAssumeUTF8 /*= PR_FALSE */)
Py_INCREF(Py_None);
} else {
if (bAssumeUTF8) {
const nsPromiseFlatCString& temp = PromiseFlatCString(s);
const nsCString temp(s);
ret = PyUnicode_DecodeUTF8(temp.get(), temp.Length(), NULL);
} else {
ret = PyString_FromStringAndSize(NULL, s.Length());
if (!ret)
return NULL;
// Need "CopyAsciiTo"!?
nsACString::const_iterator fromBegin, fromEnd;
char* dest = PyString_AS_STRING(ret);
copy_string(s.BeginReading(fromBegin), s.EndReading(fromEnd), dest);
PL_strncpy(dest, s.BeginReading(), s.Length());
}
}
return ret;
@@ -139,7 +134,7 @@ PyObject_FromNSString( const nsAString &s )
ret = Py_None;
Py_INCREF(Py_None);
} else {
const nsPromiseFlatString& temp = PromiseFlatString(s);
const nsString temp(s);
ret = PyUnicode_FromPRUnichar(temp.get(), temp.Length());
}
return ret;
@@ -988,13 +983,13 @@ PyXPCOM_InterfaceVariantHelper::~PyXPCOM_InterfaceVariantHelper()
}
}
if (ns_v.IsValDOMString() && ns_v.val.p) {
delete (const nsAString *)ns_v.val.p;
delete (const nsString *)ns_v.val.p;
}
if (ns_v.IsValCString() && ns_v.val.p) {
delete (const nsACString *)ns_v.val.p;
delete (const nsCString *)ns_v.val.p;
}
if (ns_v.IsValUTF8String() && ns_v.val.p) {
delete (const nsACString *)ns_v.val.p;
delete (const nsCString *)ns_v.val.p;
}
if (ns_v.IsValArray()) {
nsXPTCVariant &ns_v = m_var_array[i];