edink Tue Nov 23 07:07:25 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/iconv config.w32 php_iconv.h
Log:
MFH
http://cvs.php.net/diff.php/php-src/ext/iconv/config.w32?r1=1.4.2.1&r2=1.4.2.2&ty=u
Index: php-src/ext/iconv/config.w32
diff -u php-src/ext/iconv/config.w32:1.4.2.1
php-src/ext/iconv/config.w32:1.4.2.2
--- php-src/ext/iconv/config.w32:1.4.2.1 Wed Aug 4 13:13:11 2004
+++ php-src/ext/iconv/config.w32 Tue Nov 23 07:07:25 2004
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.4.2.1 2004/08/04 17:13:11 fmk Exp $
+// $Id: config.w32,v 1.4.2.2 2004/11/23 12:07:25 edink Exp $
// vim: ft=javascript
ARG_WITH("iconv", "iconv support", "yes");
@@ -12,8 +12,10 @@
AC_DEFINE("HAVE_LIBICONV", 1, "Define if libiconv is
available");
AC_DEFINE("PHP_ICONV_IMPL", "\"libiconv\"", "Which iconv
implementation to use");
AC_DEFINE("ICONV_SUPPORTS_ERRNO", 1, "Whether iconv supports
errno or not");
+ ADD_FLAG("CFLAGS_ICONV", "/D PHP_ICONV_EXPORTS ");
if (!PHP_ICONV_SHARED) {
ADD_DEF_FILE("ext\\iconv\\php_iconv.def");
}
}
}
+
http://cvs.php.net/diff.php/php-src/ext/iconv/php_iconv.h?r1=1.22.2.1&r2=1.22.2.2&ty=u
Index: php-src/ext/iconv/php_iconv.h
diff -u php-src/ext/iconv/php_iconv.h:1.22.2.1
php-src/ext/iconv/php_iconv.h:1.22.2.2
--- php-src/ext/iconv/php_iconv.h:1.22.2.1 Tue Nov 23 04:45:33 2004
+++ php-src/ext/iconv/php_iconv.h Tue Nov 23 07:07:25 2004
@@ -17,14 +17,18 @@
+----------------------------------------------------------------------+
*/
-/* $Revision: 1.22.2.1 $ */
+/* $Revision: 1.22.2.2 $ */
#ifndef PHP_ICONV_H
#define PHP_ICONV_H
#ifdef PHP_WIN32
+#ifdef PHP_ICONV_EXPORTS
#define PHP_ICONV_API __declspec(dllexport)
#else
+#define PHP_ICONV_API __declspec(dllimport)
+#endif
+#else
#define PHP_ICONV_API
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
