diff options
| author | Sadie Powell <sadie@witchery.services> | 2023-12-20 00:07:51 +0000 |
|---|---|---|
| committer | Sadie Powell <sadie@witchery.services> | 2023-12-20 00:07:51 +0000 |
| commit | 6d981960da8b7897c2ca7feb125f2770971c4154 (patch) | |
| tree | 114026b8dd7600f587ec5b4793a14070a240ca15 /src | |
| parent | 6acbd326f392a9a3a366947f6f9a05c7bdf7bc52 (diff) | |
| parent | aca9d300640361a9abfca80c1b6d07a02cf93be2 (diff) | |
Merge branch '2.0' into 2.1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.cpp | 2 | ||||
| -rw-r--r-- | src/win32/win32_memory.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/channels.cpp b/src/channels.cpp index 5c6ba55e7..7c1405501 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -308,7 +308,7 @@ void Channel::SetModeInternal(MessageSource &setter, ChannelMode *ocm, const Ano if (param.empty() && cm->type != MODE_REGULAR) { - Log() << "Channel::SetModeInternal() mode " << cm->mchar << " for " << this->name << " with no paramater, but is a param mode"; + Log() << "Channel::SetModeInternal() mode " << cm->mchar << " for " << this->name << " with no parameter, but is a param mode"; return; } diff --git a/src/win32/win32_memory.cpp b/src/win32/win32_memory.cpp index db7a46eb8..2e25e8681 100644 --- a/src/win32/win32_memory.cpp +++ b/src/win32/win32_memory.cpp @@ -22,7 +22,7 @@ * whereas on POSIX systems, shared objects loaded into an executable share * the executable's heap. This means that if we pass an arbitrary pointer to * a windows DLL which is not allocated in that dll, without some form of - * marshalling, we get a page fault. To fix this, these overrided operators + * marshalling, we get a page fault. To fix this, these overridden operators * new and delete use the windows HeapAlloc and HeapFree functions to claim * memory from the windows global heap. This makes windows 'act like' POSIX * when it comes to memory usage between dlls and exes. |