diff options
| author | Cleverking2003 <30466983+Cleverking2003@users.noreply.github.com> | 2020-06-20 21:57:17 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-20 21:57:17 +0300 |
| commit | 5592251a949bc6be10ea87a12df9b4eb47f1e545 (patch) | |
| tree | bf686b1743e8f600df2038a9780656f0db9c208b /include | |
| parent | 998591274bc26b361991d603d48c403c8e068d0b (diff) | |
| parent | b64e6294325527938bc4d95f87cc79b6a2b32ac8 (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'include')
| -rw-r--r-- | include/MWC_string.h | 1 | ||||
| -rw-r--r-- | include/string16.h | 6 |
2 files changed, 4 insertions, 3 deletions
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); |