ICU-900 fixed the same compiler warnings George fixed and I broke
X-SVN-Rev: 8163
This commit is contained in:
parent
c28ff8aa62
commit
fdf8138640
@ -96,6 +96,7 @@
|
||||
#endif
|
||||
|
||||
/* Define the library suffix in a C syntax. */
|
||||
#define U_HAVE_LIB_SUFFIX @U_HAVE_LIB_SUFFIX@
|
||||
#define U_LIB_SUFFIX_C_NAME @ICULIBSUFFIXCNAME@
|
||||
#define U_LIB_SUFFIX_C_NAME_STRING "@ICULIBSUFFIXCNAME@"
|
||||
|
||||
|
@ -148,7 +148,7 @@
|
||||
* The net result will be something of the form
|
||||
* #define U_ICU_ENTRY_POINT icudt19_dat
|
||||
*/
|
||||
#ifdef U_LIB_SUFFIX_C_NAME
|
||||
#if U_HAVE_LIB_SUFFIX
|
||||
#define U_ICUDATA_ENTRY_POINT U_DEF2_ICUDATA_ENTRY_POINT(U_ICU_VERSION_MAJOR_NUM, U_ICU_VERSION_MINOR_NUM, U_LIB_SUFFIX_C_NAME)
|
||||
#define U_DEF2_ICUDATA_ENTRY_POINT(major, minor, suffix) U_DEF_ICUDATA_ENTRY_POINT(major, minor, suffix)
|
||||
#define U_DEF_ICUDATA_ENTRY_POINT(major, minor, suffix) icudt##major##minor##suffix##_dat
|
||||
|
5
icu4c/source/configure
vendored
5
icu4c/source/configure
vendored
@ -3754,10 +3754,14 @@ echo "$ac_t""$msg" 1>&6
|
||||
|
||||
if test "$ICULIBSUFFIX" != ""
|
||||
then
|
||||
U_HAVE_LIB_SUFFIX=1
|
||||
ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/[^A-Za-z0-9_]/_/g'`
|
||||
else
|
||||
U_HAVE_LIB_SUFFIX=0
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --enable-tests or --disable-tests was given.
|
||||
if test "${enable_tests+set}" = set; then
|
||||
enableval="$enable_tests"
|
||||
@ -4135,6 +4139,7 @@ s%@thepkgicudatadir@%$thepkgicudatadir%g
|
||||
s%@DATA_PACKAGING_CPPFLAGS@%$DATA_PACKAGING_CPPFLAGS%g
|
||||
s%@DATA_PACKAGING_MODE@%$DATA_PACKAGING_MODE%g
|
||||
s%@ICULIBSUFFIX@%$ICULIBSUFFIX%g
|
||||
s%@U_HAVE_LIB_SUFFIX@%$U_HAVE_LIB_SUFFIX%g
|
||||
s%@ICULIBSUFFIXCNAME@%$ICULIBSUFFIXCNAME%g
|
||||
s%@TESTS_TRUE@%$TESTS_TRUE%g
|
||||
s%@TESTS_FALSE@%$TESTS_FALSE%g
|
||||
|
@ -4,7 +4,7 @@ dnl Copyright (c) 1999-2000, International Business Machines Corporation and
|
||||
dnl others. All Rights Reserved.
|
||||
dnl Stephen F. Booth, heavily modified by Yves and others
|
||||
|
||||
dnl $Id: configure.in,v 1.161 2002/03/16 19:55:15 yves-oss Exp $
|
||||
dnl $Id: configure.in,v 1.162 2002/03/20 22:38:08 yves-oss Exp $
|
||||
|
||||
dnl Process this file with autoconf to produce a configure script
|
||||
AC_INIT(common/unicode/utypes.h)
|
||||
@ -775,9 +775,13 @@ AC_SUBST(ICULIBSUFFIX)
|
||||
changequote(<<, >>)dnl
|
||||
if test "$ICULIBSUFFIX" != ""
|
||||
then
|
||||
U_HAVE_LIB_SUFFIX=1
|
||||
ICULIBSUFFIXCNAME=`echo _$ICULIBSUFFIX | sed 's/[^A-Za-z0-9_]/_/g'`
|
||||
else
|
||||
U_HAVE_LIB_SUFFIX=0
|
||||
fi
|
||||
changequote([, ])dnl
|
||||
AC_SUBST(U_HAVE_LIB_SUFFIX)
|
||||
AC_SUBST(ICULIBSUFFIXCNAME)
|
||||
|
||||
dnl Enable/disable tests
|
||||
|
Loading…
Reference in New Issue
Block a user