abies Wed Apr 7 06:36:00 2004 EDT
Modified files:
/php-src/ext/interbase php_ibase_includes.h ibase_service.c
Log:
Don't define ibase_service struct type unless its member types are defined
http://cvs.php.net/diff.php/php-src/ext/interbase/php_ibase_includes.h?r1=1.6&r2=1.7&ty=u
Index: php-src/ext/interbase/php_ibase_includes.h
diff -u php-src/ext/interbase/php_ibase_includes.h:1.6
php-src/ext/interbase/php_ibase_includes.h:1.7
--- php-src/ext/interbase/php_ibase_includes.h:1.6 Mon Apr 5 09:22:34 2004
+++ php-src/ext/interbase/php_ibase_includes.h Wed Apr 7 06:36:00 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ibase_includes.h,v 1.6 2004/04/05 13:22:34 abies Exp $ */
+/* $Id: php_ibase_includes.h,v 1.7 2004/04/07 10:36:00 abies Exp $ */
#ifndef PHP_IBASE_INCLUDES_H
#define PHP_IBASE_INCLUDES_H
@@ -145,12 +145,6 @@
enum event_state { NEW, ACTIVE, DEAD } state;
} ibase_event;
-typedef struct {
- isc_svc_handle handle;
- char *hostname;
- char *username;
-} ibase_service;
-
enum php_interbase_option {
PHP_IBASE_DEFAULT = 0,
/* fetch flags */
http://cvs.php.net/diff.php/php-src/ext/interbase/ibase_service.c?r1=1.7&r2=1.8&ty=u
Index: php-src/ext/interbase/ibase_service.c
diff -u php-src/ext/interbase/ibase_service.c:1.7
php-src/ext/interbase/ibase_service.c:1.8
--- php-src/ext/interbase/ibase_service.c:1.7 Mon Apr 5 09:22:33 2004
+++ php-src/ext/interbase/ibase_service.c Wed Apr 7 06:36:00 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: ibase_service.c,v 1.7 2004/04/05 13:22:33 abies Exp $ */
+/* $Id: ibase_service.c,v 1.8 2004/04/07 10:36:00 abies Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -29,6 +29,12 @@
#include "php_interbase.h"
#include "php_ibase_includes.h"
+typedef struct {
+ isc_svc_handle handle;
+ char *hostname;
+ char *username;
+} ibase_service;
+
static int le_service;
static void _php_ibase_free_service(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
