cvs: php-src /ext/iconv config.w32 php_iconv.h

From: Date: Tue, 23 Nov 2004 12:04:08 +0000
Subject: cvs: php-src /ext/iconv config.w32 php_iconv.h
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-29308@lists.php.net to get a copy of this message
edink Tue Nov 23 07:04:08 2004 EDT Modified files: /php-src/ext/iconv config.w32 php_iconv.h Log: Only dllexport during the compilation of iconv.c http://cvs.php.net/diff.php/php-src/ext/iconv/config.w32?r1=1.5&r2=1.6&ty=u Index: php-src/ext/iconv/config.w32 diff -u php-src/ext/iconv/config.w32:1.5 php-src/ext/iconv/config.w32:1.6 --- php-src/ext/iconv/config.w32:1.5 Wed Aug 4 12:46:48 2004 +++ php-src/ext/iconv/config.w32 Tue Nov 23 07:04:07 2004 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.5 2004/08/04 16:46:48 fmk Exp $ +// $Id: config.w32,v 1.6 2004/11/23 12:04:07 edink Exp $ // vim: ft=javascript ARG_WITH("iconv", "iconv support", "yes"); @@ -12,6 +12,7 @@ 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.23&r2=1.24&ty=u Index: php-src/ext/iconv/php_iconv.h diff -u php-src/ext/iconv/php_iconv.h:1.23 php-src/ext/iconv/php_iconv.h:1.24 --- php-src/ext/iconv/php_iconv.h:1.23 Tue Nov 23 04:44:54 2004 +++ php-src/ext/iconv/php_iconv.h Tue Nov 23 07:04:07 2004 @@ -17,14 +17,18 @@ +----------------------------------------------------------------------+ */ -/* $Revision: 1.23 $ */ +/* $Revision: 1.24 $ */ #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

« previous php.cvs (#29308) next »