diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | wince/setup.mak | 10 | ||||
| -rw-r--r-- | wince/stdlib.c | 4 |
3 files changed, 14 insertions, 6 deletions
@@ -1,3 +1,9 @@ +Sun Jun 8 13:37:21 2003 Takaaki Uematsu <uema2x@jcom.home.ne.jp> + + * wince/setup.mak: set SUBSYSTEM in each platform. + + * wince/stdlib.c: fix mblen() bug. + Sat Jun 7 22:22:03 2003 Yukihiro Matsumoto <matz@ruby-lang.org> * parse.y (value_expr0): class and module statements should not be diff --git a/wince/setup.mak b/wince/setup.mak index 316d0f3a0..59382c3a2 100644 --- a/wince/setup.mak +++ b/wince/setup.mak @@ -105,7 +105,7 @@ $(CPU) = $(PROCESSOR_LEVEL) @$(APPEND) CECPUDEF = -DARM -D_ARM_ -DARMV4 @$(APPEND) $(ARCH) = ARM -armv4t-:: - @$(APPEND) CECPUDEF = -DARM -D_ARM_ -DARMV4T + @$(APPEND) CECPUDEF = -DARM -D_ARM_ -DARMV4T -DTHUMB -D_THUMB_ @$(APPEND) $(ARCH) = THUMB @@ -131,7 +131,6 @@ EMBEDDED_TOOLS_DIR = $(EMBEDDED_TOOLS_DIR) OS = mswince RT = $$(OS) -SUBSYSTEM = windowsce << -mswince4-: @@ -145,7 +144,6 @@ EMBEDDED_TOOLS4_DIR = $(EMBEDDED_TOOLS4_DIR) OS = mswince RT = $$(OS) -SUBSYSTEM = windowsce << @@ -167,12 +165,14 @@ PATH = $$(EMBEDDED_TOOLS4_DIR)/common/evc/bin;$$(EMBEDDED_TOOLS4_DIR)/EVC/WCE$$( -hpc2000-: @type << >>$(MAKEFILE) +SUBSYSTEM = windowsce,3.0 INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/$(@:-=)/include LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/$(@:-=)/lib/$$(PROCESSOR_ARCHITECTURE) << "-MS Pocket PC-": @type << >>$(MAKEFILE) +SUBSYSTEM = windowsce,3.0 INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS Pocket PC/include LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS Pocket PC/lib/$$(PROCESSOR_ARCHITECTURE) << @@ -180,12 +180,14 @@ LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS Pocket PC/lib/$$(PROCESSOR_ARC "-MS HPC Pro--": @type << >>$(MAKEFILE) +SUBSYSTEM = windowsce,2.11 INCLUDE = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS HPC Pro/include LIB = $$(CE_TOOLS_DIR)/wce$$(SUBSYSVERSION:.=)/MS HPC Pro/lib/$$(PROCESSOR_ARCHITECTURE) << -.net41-: @type << >>$(MAKEFILE) +SUBSYSTEM = windowsce,4.1 INCLUDE = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/include/$$(ARCHFOLDER) LIB = $$(CE_TOOLS4_DIR)/wce400/STANDARDSDK/lib/$$(ARCHFOLDER) << @@ -208,7 +210,7 @@ RUBY_SO_NAME = $(RUBY_SO_NAME) CPPFLAGS = -I. -I$$(srcdir) -I$$(srcdir)/missing -I$$(srcdir)/wince \ $$(CECPUDEF) -DUNDER_CE -D_WIN32_WCE=$$(SUBSYSVERSION:.=) \ -DFILENAME_MAX=MAX_PATH -DTLS_OUT_OF_INDEXES=0xFFFFFFFF \ - -DBUFSIZ=512 -D_UNICODE -DUNICODE -DUNDER_CE + -DBUFSIZ=512 -D_UNICODE -DUNICODE # STACK = 0x10000,0x1000 # LDFLAGS = $$(CFLAGS) -Fm # XLDFLAGS = diff --git a/wince/stdlib.c b/wince/stdlib.c index c7f0c8428..a2ac340de 100644 --- a/wince/stdlib.c +++ b/wince/stdlib.c @@ -30,9 +30,9 @@ int mblen(const char *mbstr, size_t count) { if( *p=='\0' ) break; if( IsDBCSLeadByteEx( CP_ACP, *p ) ) - n+=2; + n+=2, p+=2; else - n+=1; + n+=1, p+=1; } return n; |