1
0
mirror of https://github.com/roytam1/UXP.git synced 2026-05-26 13:58:49 +00:00

Fix nits.

I hope this addresses everything.
This commit is contained in:
athenian200
2019-10-31 19:35:03 -05:00
committed by Roy Tam
parent 45bf760ac5
commit 1e75eb89f3
3 changed files with 22 additions and 12 deletions
+1 -1
View File
@@ -134,7 +134,7 @@ std::string SysInfo::OperatingSystemName() {
}
// Solaris <sys/utsname.h> contains "extern struct utsname utsname;"
// As a consequence, any use of utsname has to be proceeded with struct on
// As a consequence, any use of utsname has to be preceded with struct on
// Solaris. See Mozilla bugs 758483 and 1353332.
// static
+1 -1
View File
@@ -4,7 +4,7 @@
EXTRA_DEPS += $(topsrcdir)/toolkit/library/libxul.mk
ifeq (Linux,$(OS_ARCH))
ifeq (Linux,$(OS_ARCH))
ifneq (Android,$(OS_TARGET))
OS_LDFLAGS += -Wl,-version-script,symverscript
@@ -104,22 +104,32 @@ invoke_copy_to_stack(uint32_t* d, uint32_t paramCount, nsXPTCVariant* s)
}
switch(l_s->type)
{
case nsXPTType::T_I8 : *((int32_t*) l_d) = l_s->val.i8; break;
case nsXPTType::T_I16 : *((int32_t*) l_d) = l_s->val.i16; break;
case nsXPTType::T_I32 : *((int32_t*) l_d) = l_s->val.i32; break;
case nsXPTType::T_I8 : *((int32_t*) l_d) = l_s->val.i8;
break;
case nsXPTType::T_I16 : *((int32_t*) l_d) = l_s->val.i16;
break;
case nsXPTType::T_I32 : *((int32_t*) l_d) = l_s->val.i32;
break;
case nsXPTType::T_I64 :
case nsXPTType::T_U64 :
case nsXPTType::T_DOUBLE : *((uint32_t*) l_d++) = ((DU *)l_s)->hi;
if (regCount < 5) regCount++;
*((uint32_t*) l_d) = ((DU *)l_s)->lo;
break;
case nsXPTType::T_U8 : *((uint32_t*) l_d) = l_s->val.u8; break;
case nsXPTType::T_U16 : *((uint32_t*) l_d) = l_s->val.u16; break;
case nsXPTType::T_U32 : *((uint32_t*) l_d) = l_s->val.u32; break;
case nsXPTType::T_FLOAT : *((float*) l_d) = l_s->val.f; break;
case nsXPTType::T_BOOL : *((uint32_t*) l_d) = l_s->val.b; break;
case nsXPTType::T_CHAR : *((uint32_t*) l_d) = l_s->val.c; break;
case nsXPTType::T_WCHAR : *((int32_t*) l_d) = l_s->val.wc; break;
case nsXPTType::T_U8 : *((uint32_t*) l_d) = l_s->val.u8;
break;
case nsXPTType::T_U16 : *((uint32_t*) l_d) = l_s->val.u16;
break;
case nsXPTType::T_U32 : *((uint32_t*) l_d) = l_s->val.u32;
break;
case nsXPTType::T_FLOAT : *((float*) l_d) = l_s->val.f;
break;
case nsXPTType::T_BOOL : *((uint32_t*) l_d) = l_s->val.b;
break;
case nsXPTType::T_CHAR : *((uint32_t*) l_d) = l_s->val.c;
break;
case nsXPTType::T_WCHAR : *((int32_t*) l_d) = l_s->val.wc;
break;
default:
// all the others are plain pointer types
*((void**)l_d) = l_s->val.p;