summaryrefslogtreecommitdiff
path: root/Source/Kernel/Library
diff options
context:
space:
mode:
authorAlexis211 <alexis211@gmail.com>2009-09-20 15:06:07 +0200
committerAlexis211 <alexis211@gmail.com>2009-09-20 15:06:07 +0200
commit9bdc18da391979479ad5c677770c3e8dffa1cb9a (patch)
tree412f79bf1dcbc5ea11d8aff6d2b016dacab2de3c /Source/Kernel/Library
parentaf3ff7f8c80bb3953f261a602316f92ec662daa8 (diff)
downloadMelon-9bdc18da391979479ad5c677770c3e8dffa1cb9a.tar.gz
Melon-9bdc18da391979479ad5c677770c3e8dffa1cb9a.zip
Keymaps are now loaded from ramfs.
Diffstat (limited to 'Source/Kernel/Library')
-rw-r--r--Source/Kernel/Library/WChar.class.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/Kernel/Library/WChar.class.cpp b/Source/Kernel/Library/WChar.class.cpp
index a6ecf3f..ee42849 100644
--- a/Source/Kernel/Library/WChar.class.cpp
+++ b/Source/Kernel/Library/WChar.class.cpp
@@ -1,5 +1,9 @@
#include "WChar.class.h"
+#ifdef THIS_IS_MELON
+using namespace CMem;
+#endif
+
WChar WChar::CP437[] = { //These are the UTF8 equivalents for the 128 extra characters of code page 437
"Ç", "ü", "é", "â", "ä", "à", "å", "ç", "ê", "ë", "è", "ï", "î", "ì", "Ä", "Å",
"É", "æ", "Æ", "ô", "ö", "ò", "û", "ù", "ÿ", "Ö", "Ü", "¢", "£", "¥", "₧", "ƒ",
@@ -42,7 +46,7 @@ u32int WChar::ucharLen(const char* c, u8int encoding) {
}
u32int WChar::utfLen(const char* c, u8int encoding) {
- int i = 0, l = CMem::strlen(c), co = 0;
+ int i = 0, l = strlen(c), co = 0;
while (i < l) {
i += ucharLen(c + i, encoding);
co++;