Moriyoshi Koizumi
moriy****@users*****
2003年 8月 25日 (月) 04:13:48 JST
moriyoshi 03/08/25 04:13:48
Modified: . Tag: LIBMBFL_1_0 config.h.vc6
mbfl Tag: LIBMBFL_1_0 mbfl_encoding.c mbfl_language.c
Added: . Tag: LIBMBFL_1_0 Makefile.bcc32
filters Tag: LIBMBFL_1_0 Makefile.bcc32
mbfl Tag: LIBMBFL_1_0 Makefile.bcc32
nls Tag: LIBMBFL_1_0 Makefile.bcc32
Log:
- Fix Borland C++ build
- Move stricmp() macro to the the same place as in the HEAD branch
Revision Changes Path
No revision
No revision
1.1.2.4 +0 -2 libmbfl/config.h.vc6
Index: config.h.vc6
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/config.h.vc6,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- config.h.vc6 23 Aug 2003 10:16:12 -0000 1.1.2.3
+++ config.h.vc6 24 Aug 2003 19:13:47 -0000 1.1.2.4
@@ -10,5 +10,3 @@
#define HAVE_WIN32_NATIVE_THREAD 1
#define USE_WIN32_NATIVE_THREAD 1
#define ENABLE_THREADS 1
-
-#define strcasecmp(s1, s2) stricmp(s1, s2)
No revision
No revision
1.4.2.1 +2 -0 libmbfl/Makefile.bcc32
Index: Makefile.bcc32
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/Makefile.bcc32,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Makefile.bcc32 30 Dec 2002 21:57:52 -0000 1.4
+++ Makefile.bcc32 24 Aug 2003 19:13:47 -0000 1.4.2.1
@@ -22,6 +22,8 @@
clean:
@for %i in ($(SUBDIRS)) do $(COMSPEC) /C mksbcc32.bat $(MAKE) %i clean
+ @if exist linker.rsp del linker.rsp
+ @if exist mbfl.RES del mbfl.RES
@if exist mbfl.dll del mbfl.dll
@if exist mbfl.lib del mbfl.lib
@if exist config.h del config.h
No revision
No revision
1.2.2.1 +0 -0 libmbfl/filters/Makefile.bcc32
Index: Makefile.bcc32
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/filters/Makefile.bcc32,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1
No revision
No revision
1.1.2.4 +7 -0 libmbfl/mbfl/mbfl_encoding.c
Index: mbfl_encoding.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_encoding.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- mbfl_encoding.c 23 Aug 2003 08:11:29 -0000 1.1.2.3
+++ mbfl_encoding.c 24 Aug 2003 19:13:47 -0000 1.1.2.4
@@ -96,6 +96,13 @@
#include "filters/mbfilter_ucs2.h"
#include "filters/mbfilter_htmlent.h"
+#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRICMP
+#define strcasecmp stricmp
+#endif
+#endif
+
+
static const char *mbfl_encoding_auto_aliases[] = {"unknown", NULL};
static const mbfl_encoding mbfl_encoding_auto = {
1.1.2.5 +6 -0 libmbfl/mbfl/mbfl_language.c
Index: mbfl_language.c
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/mbfl_language.c,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- mbfl_language.c 23 Aug 2003 08:11:29 -0000 1.1.2.4
+++ mbfl_language.c 24 Aug 2003 19:13:47 -0000 1.1.2.5
@@ -61,6 +61,12 @@
#include "nls/nls_en.h"
#include "nls/nls_neutral.h"
+#ifndef HAVE_STRCASECMP
+#ifdef HAVE_STRICMP
+#define strcasecmp stricmp
+#endif
+#endif
+
static const mbfl_language *mbfl_language_ptr_table[] = {
&mbfl_language_uni,
&mbfl_language_japanese,
No revision
No revision
1.4.2.1 +1 -1 libmbfl/mbfl/Makefile.bcc32
Index: Makefile.bcc32
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/mbfl/Makefile.bcc32,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -u -r1.4 -r1.4.2.1
--- Makefile.bcc32 30 Dec 2002 16:43:15 -0000 1.4
+++ Makefile.bcc32 24 Aug 2003 19:13:47 -0000 1.4.2.1
@@ -1,5 +1,5 @@
!include ..\rules.mak.bcc32
-OBJS=mbfilter.obj mbfl_string.obj mbfl_language.obj mbfl_encoding.obj mbfl_convert.obj mbfl_ident.obj mbfl_memory_device.obj mbfl_allocators.obj mbfl_filter_output.obj mbfilter_pass.obj mbfilter_wchar.obj mbfilter_8bit.obj mbfl_buffer_converter.obj mbfl_wchar_device.obj mbfl_mutex.obj mbfl_collection.obj mbfl_list.obj mbfl_arraylist.obj mbfl_iterator.obj
+OBJS=mbfilter.obj mbfilter_8bit.obj mbfilter_pass.obj mbfilter_wchar.obj mbfl_allocators.obj mbfl_convert.obj mbfl_encoding.obj mbfl_filter_output.obj mbfl_ident.obj mbfl_language.obj mbfl_memory_device.obj mbfl_string.obj
all: $(OBJS)
No revision
No revision
1.2.2.1 +0 -0 libmbfl/nls/Makefile.bcc32
Index: Makefile.bcc32
===================================================================
RCS file: /cvsroot/php-i18n/libmbfl/nls/Makefile.bcc32,v
retrieving revision 1.2
retrieving revision 1.2.2.1
diff -u -r1.2 -r1.2.2.1