You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2003/03/10 10:50:39 UTC
cvs commit: apr/misc/unix charset.c
jorton 2003/03/10 01:50:39
Modified: . configure.in
misc/unix charset.c
Log:
Tidy up langinfo checks: the results of these checks aren't exported
via apr.h, so there is no need to use APR_FLAG_*, and no need to check
for CODESET in configure.
Revision Changes Path
1.518 +2 -3 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.517
retrieving revision 1.518
diff -u -r1.517 -r1.518
--- configure.in 7 Mar 2003 19:05:54 -0000 1.517
+++ configure.in 10 Mar 2003 09:50:38 -0000 1.518
@@ -1835,9 +1835,8 @@
dnl Check for langinfo support
-APR_FLAG_HEADERS(langinfo.h)
-APR_FLAG_FUNCS(nl_langinfo)
-APR_CHECK_DEFINE(CODESET, langinfo.h, [CODESET defined in langinfo.h])
+AC_CHECK_HEADERS(langinfo.h)
+AC_CHECK_FUNCS(nl_langinfo)
dnl ----------------------------- Finalize the variables
1.4 +1 -1 apr/misc/unix/charset.c
Index: charset.c
===================================================================
RCS file: /home/cvs/apr/misc/unix/charset.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- charset.c 7 Mar 2003 19:05:54 -0000 1.3
+++ charset.c 10 Mar 2003 09:50:38 -0000 1.4
@@ -103,7 +103,7 @@
APR_DECLARE(const char*) apr_os_locale_encoding (apr_pool_t *pool)
{
-#if defined(HAVE_NL_LANGINFO) && defined(HAVE_CODESET)
+#if defined(HAVE_NL_LANGINFO) && defined(CODESET)
const char *charset;
charset = nl_langinfo(CODESET);