organicmaps/icu
13
Fork 0
mirror of https://github.com/unicode-org/icu.git synced 2025-04-13 08:53:20 +00:00
Code Issues1 Projects Releases Wiki Activity Actions3

ICU-1075 Change the data entrypoint name to make it the same as Windows.

Browse source 
X-SVN-Rev: 6520
This commit is contained in:
George Rhoten 2001-10-31 17:55:10 +00:00
parent 1ac851090f
commit 5c6348c4c2
3 changed files with 6 additions and 20 deletions
icu4c/source
common/unicode
utypes.h
data
Makefile.in
icudefs.mk.in

19
icu4c/source/common/unicode/utypes.h
View file

@ -147,25 +147,10 @@
* the literal text U_ICU_VERSION_MAJOR_NUM into the name.
* The net result will be something of the form
* #define U_ICU_ENTRY_POINT icudt19_dat
* Note & TODO: On Unixes, the name includes the endianness letter
* e.g. icudt19l_dat. It should be removed, which will
* involve doing something in the area of the data build.
*/
#ifdef WIN32
#pragma warning( disable : 4003 ) /* Disable 'not enough actual parameters for macro' warning */
#define U_ICUDATA_ENTRY_POINT U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM)
#else
#define U_ICUDATA_ENTRY_POINT U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_ICUDATA_TYPE_LITLETTER)
#endif
#define U_DEF2_ICUDATA_ENTRY_POINT(major, minor, letter) U_DEF_ICUDATA_ENTRY_POINT(major, minor, letter)
#define U_DEF_ICUDATA_ENTRY_POINT(major, minor, letter) icudt##major##minor##letter##_dat
#if 0
#define FOO(X) STRINGIZE(X)
#define BAR FOO(U_ICUDATA_ENTRY_POINT)
#define STRINGIZE(X) #X
#pragma message("icu data entrypoint name is " BAR)
#endif
#define U_DEF2_ICUDATA_ENTRY_POINT(major, minor) U_DEF_ICUDATA_ENTRY_POINT(major, minor)
#define U_DEF_ICUDATA_ENTRY_POINT(major, minor) icudt##major##minor##_dat
/**
* \def U_CALLCONV

4
icu4c/source/data/Makefile.in
View file

@ -109,7 +109,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
packagedata: build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc
( cd build ; \
$(INVOKE) $(PKGDATA) -e $(ICUDATA_NAME) -s . -T . -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) icudata.lst ; \
$(INVOKE) $(PKGDATA) -e $(ICUDATA_BASENAME_VERSION) -s . -T . -p $(ICUDATA_NAME) -m $(PKGDATA_MODE) icudata.lst ; \
)
ifeq ($(strip $(PKGDATA_MODE)), dll)
$(RM) libicudata.$(SO) && ln -s $(LIB_ICUDATA_NAME).$(SO) libicudata.$(SO) ;
@ -127,7 +127,7 @@ cleanpackage:
## Install ICU data. Make a convenience link 'icudata' library if it's a library mode.
install-local: build/icudata.lst $(top_builddir)/tools/pkgdata/icupkg.inc install-convrtrstxt
$(MKINSTALLDIRS) $(TMPDATADIR) $(DESTDIR)$(libdir)
( cd build ; $(INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) -e $(ICUDATA_NAME) -T . -s . -p $(ICUDATA_NAME) icudata.lst -I $(DESTDIR)$(libdir) )
( cd build ; $(INVOKE) $(PKGDATA) -m $(PKGDATA_MODE) -e $(ICUDATA_BASENAME_VERSION) -T . -s . -p $(ICUDATA_NAME) icudata.lst -I $(DESTDIR)$(libdir) )
ifeq ($(strip $(PKGDATA_MODE)),dll)
(cd $(DESTDIR)$(libdir); $(RM) libicudata.$(SO) && ln -s $(LIB_ICUDATA_NAME).$(SO) libicudata.$(SO))
endif

3
icu4c/source/icudefs.mk.in
View file

@ -36,7 +36,8 @@ SO_TARGET_VERSION = @LIB_VERSION@
SO_TARGET_VERSION_MAJOR = @LIB_VERSION_MAJOR@
# Should be the same as U_ICUDATA_NAME
ICUDATA_NAME = icudt@LIB_VERSION_MAJOR@@ICUDATA_CHAR@
ICUDATA_BASENAME_VERSION = icudt@LIB_VERSION_MAJOR@
ICUDATA_NAME = $(ICUDATA_BASENAME_VERSION)@ICUDATA_CHAR@
ifeq ($(strip $(PKGDATA_MODE)),)
PKGDATA_MODE=@DATA_PACKAGING_MODE@
endif