cvs: php-src /ext/bz2 config.w32 php_bz2.h

wez Wed Dec 3 21:58:34 2003 EDT Added files: /php-src/ext/bz2 config.w32 Modified files: /php-src/ext/bz2 php_bz2.h Log: Fixup bz2 extension so it builds as shared and static under win32 Index: php-src/ext/bz2/php_bz2.h diff -u php-src/ext/bz2/php_bz2.h:1.1 php-src/ext/bz2/php_bz2.h:1.2 --- php-src/ext/bz2/php_bz2.h:1.1 Sat May 17 10:27:07 2003 +++ php-src/ext/bz2/php_bz2.h Wed Dec 3 21:58:33 2003 @@ -44,16 +44,18 @@ #ifdef PHP_WIN32 # ifdef PHP_BZ2_EXPORTS -# define PHP_BZ2_API __declspec(dllexport) +# define PHP_BZ2_API __declspec(dllexport) +# elif defined(COMPILE_DL_BZ2) +# define PHP_BZ2_API __declspec(dllimport) # else -# define PHP_BZ2_API __declspec(dllimport) +# define PHP_BZ2_API /* nothing special */ # endif #else # define PHP_BZ2_API #endif -PHP_BZ2_API PHPAPI php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); -PHP_BZ2_API PHPAPI php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC); +PHP_BZ2_API php_stream *_php_stream_bz2open(php_stream_wrapper *wrapper, char *path, char *mode, int options, char **opened_path, php_stream_context *context STREAMS_DC TSRMLS_DC); +PHP_BZ2_API php_stream *_php_stream_bz2open_from_BZFILE(BZFILE *bz, char *mode, php_stream *innerstream STREAMS_DC TSRMLS_DC); #define php_stream_bz2open_from_BZFILE(bz, mode, innerstream) _php_stream_bz2open_from_BZFILE((bz), (mode), (innerstream) STREAMS_CC TSRMLS_CC) #define php_stream_bz2open(wrapper, path, mode, options, opened_path) _php_stream_bz2open((wrapper), (path), (mode), (options), (opened_path), NULL STREAMS_CC TSRMLS_CC) Index: php-src/ext/bz2/config.w32 +++ php-src/ext/bz2/config.w32 // $Id: config.w32,v 1.1 2003/12/04 02:58:33 wez Exp $ // vim:ft=javascript ARG_WITH("bz2", "BZip2", "no"); if (PHP_BZ2 != "no") { if (CHECK_LIB("libbz2.lib", "bz2", PHP_BZ2) && CHECK_HEADER_ADD_INCLUDE("bzlib.h", "CFLAGS_BZ2")) { EXTENSION("bz2", "bz2.c"); AC_DEFINE('HAVE_BZ2', 1, 'Have BZ2 library'); // BZ2 extension does this slightly differently from others if (PHP_BZ2_SHARED) { ADD_FLAG("CFLAGS_BZ2", "/D PHP_BZ2_EXPORTS "); } } else { WARNING("bz2 not enabled; libraries and headers not found"); } }