sniper Wed Jul 30 10:09:53 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/iconv config.m4 iconv.c php_iconv.h
Log:
MFH
Index: php-src/ext/iconv/config.m4
diff -u php-src/ext/iconv/config.m4:1.19.2.1 php-src/ext/iconv/config.m4:1.19.2.2
--- php-src/ext/iconv/config.m4:1.19.2.1 Sun Jul 6 17:11:51 2003
+++ php-src/ext/iconv/config.m4 Wed Jul 30 10:09:52 2003
@@ -1,5 +1,5 @@
dnl
-dnl $Id: config.m4,v 1.19.2.1 2003/07/06 21:11:51 moriyoshi Exp $
+dnl $Id: config.m4,v 1.19.2.2 2003/07/30 14:09:52 sniper Exp $
dnl
PHP_ARG_WITH(iconv, for iconv support,
@@ -27,10 +27,10 @@
LDFLAGS="-L$PHP_ICONV_PREFIX/lib $LDFLAGS"
if test -r $PHP_ICONV_PREFIX/include/giconv.h; then
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/giconv.h"
+ PHP_ICONV_H="giconv.h"
else
- PHP_ICONV_H_PATH="$PHP_ICONV_PREFIX/include/iconv.h"
- fi
+ PHP_ICONV_H="iconv.h"
+ fi
if test -z "$iconv_lib_name"; then
AC_MSG_CHECKING([if iconv is glibc's])
@@ -88,7 +88,7 @@
AC_MSG_CHECKING([if iconv supports errno])
AC_TRY_RUN([
-#include <$PHP_ICONV_H_PATH>
+#include <$PHP_ICONV_H>
#include <errno.h>
int main() {
@@ -97,7 +97,7 @@
if (cd == (iconv_t)(-1)) {
if (errno == EINVAL) {
return 0;
- } else {
+ } else {
return 1;
}
}
@@ -116,9 +116,6 @@
CFLAGS="$iconv_cflags_save"
LDFLAGS="$iconv_ldflags_save"
-
- PHP_DEFINE([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>])
- AC_DEFINE_UNQUOTED([PHP_ICONV_H_PATH], [<$PHP_ICONV_H_PATH>], [Path to iconv.h])
PHP_NEW_EXTENSION(iconv, iconv.c, $ext_shared)
PHP_SUBST(ICONV_SHARED_LIBADD)
Index: php-src/ext/iconv/iconv.c
diff -u php-src/ext/iconv/iconv.c:1.65.2.7 php-src/ext/iconv/iconv.c:1.65.2.8
--- php-src/ext/iconv/iconv.c:1.65.2.7 Sun Jul 6 17:12:59 2003
+++ php-src/ext/iconv/iconv.c Wed Jul 30 10:09:52 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: iconv.c,v 1.65.2.7 2003/07/06 21:12:59 moriyoshi Exp $ */
+/* $Id: iconv.c,v 1.65.2.8 2003/07/30 14:09:52 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,16 +31,15 @@
#include "php_ini.h"
#include <errno.h>
-
#include "php_iconv.h"
#ifdef HAVE_ICONV
-#ifndef PHP_ICONV_H_PATH
-#define PHP_ICONV_H_PATH <iconv.h>
+#ifdef HAVE_GICONV_H
+#include <giconv.h>
+#else
+#include <iconv.h>
#endif
-
-#include PHP_ICONV_H_PATH
#ifdef HAVE_GLIBC_ICONV
#include <gnu/libc-version.h>
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.12.2.3 php-src/ext/iconv/php_iconv.h:1.12.2.4
--- php-src/ext/iconv/php_iconv.h:1.12.2.3 Sun Jul 6 17:11:51 2003
+++ php-src/ext/iconv/php_iconv.h Wed Jul 30 10:09:52 2003
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Revision: 1.12.2.3 $ */
+/* $Revision: 1.12.2.4 $ */
#ifndef PHP_ICONV_H
#define PHP_ICONV_H
@@ -35,7 +35,6 @@
#include "php_have_bsd_iconv.h"
#include "php_iconv_supports_errno.h"
#include "php_php_iconv_impl.h"
-#include "php_php_iconv_h_path.h"
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
