[PHP-CVS] cvs: php-src /ext/interbase interbase.c

[Ard Biesheuvel]

abies           Tue Sep 16 16:28:29 2003 EDT

  Modified files:              
    /php-src/ext/interbase      interbase.c 
  Log:
  Use isc_get_version() for client lib info if available
  
Index: php-src/ext/interbase/interbase.c
diff -u php-src/ext/interbase/interbase.c:1.182 php-src/ext/interbase/interbase.c:1.183
--- php-src/ext/interbase/interbase.c:1.182     Tue Sep 16 15:44:56 2003
+++ php-src/ext/interbase/interbase.c   Tue Sep 16 16:28:27 2003
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: interbase.c,v 1.182 2003/09/16 19:44:56 hholzgra Exp $ */
+/* $Id: interbase.c,v 1.183 2003/09/16 20:28:27 abies Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -26,7 +26,7 @@
 
 #include "php.h"
 
-#define FILE_REVISION "$Revision: 1.182 $"
+#define FILE_REVISION "$Revision: 1.183 $"
 
 #if HAVE_IBASE && !defined(VERSION_INFO_ONLY)
 
@@ -69,6 +69,9 @@
 #ifdef PHP_WIN32
 #define LL_MASK "I64"
 #define LL_LIT(lit) lit ## I64
+#ifdef FB_SQLDA
+#pragma comment(lib, "fbclient_ms.lib")
+#endif
 #else
 #define LL_MASK "ll"
 #define LL_LIT(lit) lit ## ll
@@ -717,22 +720,20 @@
  
 PHP_MINFO_FUNCTION(ibase)
 {
-       char tmp[32];
+       char tmp[64];
 
        php_info_print_table_start();
        php_info_print_table_row(2, "Interbase Support", "enabled");
 
-       php_info_print_table_row(2, "Client Library",
-#if (SQLDA_CURRENT_VERSION == 1 && SQL_DIALECT_CURRENT == 1)
-               "Interbase 5.6 or earlier");
-#elif (SQLDA_CURRENT_VERSION == 2 && SQL_DIALECT_CURRENT == 3)
-               "Interbase 7 or later");
+#if (SQLDA_CURRENT_VERSION > 1) || defined(FB_SQLDA)
+       isc_get_client_version(tmp);
+       php_info_print_table_row(2, "Client Library", tmp);
+#elif (SQL_DIALECT_CURRENT == 1)
+       php_info_print_table_row(2, "Client Library", "Interbase 5.6 or earlier");
 #elif !defined(DSC_null)
-               "Interbase 6");
-#elif !defined(FB_SQLDA)
-               "Firebird 1.0");
+       php_info_print_table_row(2, "Client Library", "Interbase 6");
 #else
-               "Firebird 1.5 or later");
+       php_info_print_table_row(2, "Client Library", "Firebird 1.0");
 #endif
 
        php_info_print_table_row(2, "Revision", FILE_REVISION);

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php