diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-06-20 14:24:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 14:24:42 -0400 |
| commit | b64e6294325527938bc4d95f87cc79b6a2b32ac8 (patch) | |
| tree | d79e43498e57e6e16bbb993fca4997f641837b1a | |
| parent | 16b091058e6135f9b7875fcf074d812d610df380 (diff) | |
| parent | 0276df552ddad1e5dca278daf9e7826d285d9dc3 (diff) | |
Merge pull request #182 from PikalaxALT/pikalax_work
Minor fixes
| -rw-r--r-- | charmap.txt | bin | 0 -> 46016 bytes | |||
| -rw-r--r-- | include/MWC_string.h | 1 | ||||
| -rw-r--r-- | include/string16.h | 6 | ||||
| -rw-r--r-- | tools/o2narc/elf.h | 14 |
4 files changed, 9 insertions, 12 deletions
diff --git a/charmap.txt b/charmap.txt Binary files differnew file mode 100644 index 00000000..41724bdf --- /dev/null +++ b/charmap.txt diff --git a/include/MWC_string.h b/include/MWC_string.h index d2980fb6..79639239 100644 --- a/include/MWC_string.h +++ b/include/MWC_string.h @@ -4,5 +4,6 @@ #include "nitro/types.h" void * memset(void *, int, u32); +void * memcpy(void *, const void *, u32); #endif //GUARD_MWC_STRING_H diff --git a/include/string16.h b/include/string16.h index 91888a7b..71880020 100644 --- a/include/string16.h +++ b/include/string16.h @@ -3,11 +3,11 @@ struct String { - u16 len; - u16 pos; + u16 maxsize; + u16 size; u32 magic; - u16 unk8; u16 data[1]; + u8 padding[2]; }; struct String * String_ctor(u32 count, u32 heap_id); diff --git a/tools/o2narc/elf.h b/tools/o2narc/elf.h index ad47e94e..c5f9f279 100644 --- a/tools/o2narc/elf.h +++ b/tools/o2narc/elf.h @@ -1,15 +1,13 @@ #ifndef _ELF_H #define _ELF_H 1 -#ifdef __cplusplus -extern "C" { -#endif - /* Standard ELF types. */ #include <inttypes.h> -__BEGIN_DECLS +#ifdef __cplusplus +extern "C" { +#endif /* Type for a 16-bit quantity. */ typedef uint16_t Elf32_Half; @@ -2425,10 +2423,8 @@ typedef Elf32_Addr Elf32_Conflict; #define R_X86_64_NUM 24 -__END_DECLS - #ifdef __cplusplus }; -#endif //__cplusplus +#endif -#endif /* elf.h */
\ No newline at end of file +#endif /* elf.h */ |