diff options
| author | athenian200 <athenian200@outlook.com> | 2019-10-31 19:35:03 -0500 |
|---|---|---|
| committer | athenian200 <athenian200@outlook.com> | 2019-10-31 19:35:03 -0500 |
| commit | a9dc528a4a7b0aaad5308aff70963485ec3e9bec (patch) | |
| tree | ed292054c46d4131bd475ae690df41b5b07a4a45 | |
| parent | 687a798e6dedacb8b42826debcd8e89baa69ce94 (diff) | |
| download | uxp-a9dc528a4a7b0aaad5308aff70963485ec3e9bec.tar.gz | |
Fix nits.
I hope this addresses everything.
| -rw-r--r-- | ipc/chromium/src/base/sys_info_posix.cc | 2 | ||||
| -rw-r--r-- | toolkit/library/libxul.mk | 2 | ||||
| -rw-r--r-- | xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_solaris.cpp | 30 |
3 files changed, 22 insertions, 12 deletions
diff --git a/ipc/chromium/src/base/sys_info_posix.cc b/ipc/chromium/src/base/sys_info_posix.cc index f29c85092f..632aa2f37f 100644 --- a/ipc/chromium/src/base/sys_info_posix.cc +++ b/ipc/chromium/src/base/sys_info_posix.cc @@ -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 diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk index 8533a015d5..80f934e60e 100644 --- a/toolkit/library/libxul.mk +++ b/toolkit/library/libxul.mk @@ -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 diff --git a/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_solaris.cpp b/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_solaris.cpp index 126ef1dad2..c1b679779b 100644 --- a/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_solaris.cpp +++ b/xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_solaris.cpp @@ -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; |