cvs: php-src /ext/yaz php_yaz.c

dickmeiss Fri Jul 4 15:17:08 2003 EDT Modified files: /php-src/ext/yaz php_yaz.c Log: On Windows, handle YAZ versions that don't export yaz_version. Index: php-src/ext/yaz/php_yaz.c diff -u php-src/ext/yaz/php_yaz.c:1.75 php-src/ext/yaz/php_yaz.c:1.76 --- php-src/ext/yaz/php_yaz.c:1.75 Tue Jun 10 16:03:40 2003 +++ php-src/ext/yaz/php_yaz.c Fri Jul 4 15:17:08 2003 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_yaz.c,v 1.75 2003/06/10 20:03:40 imajes Exp $ */ +/* $Id: php_yaz.c,v 1.76 2003/07/04 19:17:08 dickmeiss Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -1545,7 +1545,19 @@ { char version_str[20]; +#if WIN32 + HINSTANCE h = LoadLibrary("yaz"); + unsigned long (__cdecl *p)(char *version_str, char *sys_str) = 0; + strcpy(version_str, "unknown"); + + if (h && (p = (unsigned long(__cdecl*)(char*,char*)) + GetProcAddress(h, "yaz_version"))) + p(version_str, 0); + if (h) + FreeLibrary(h); +#else yaz_version(version_str, 0); +#endif php_info_print_table_start(); php_info_print_table_row(2, "YAZ Support", "enabled"); php_info_print_table_row(2, "YAZ Version", version_str);