Some general cleaning up

Some preliminary changes for extensions to array functions

diff --git a/ext/interbase/php_interbase.h b/ext/interbase/php_interbase.h
index 3c2a5b46cdffb6ce93de1bcd256a725f5b32fc46..55039683b26a0b0203d6b6af8cb14116c49e0901 100644 (file)
--- a/ext/interbase/php_interbase.h
+++ b/ext/interbase/php_interbase.h
@@ -23,8 +23,6 @@
 #ifndef PHP_INTERBASE_H
 #define PHP_INTERBASE_H
 
-#if HAVE_IBASE
-
 #include <ibase.h>
 
 extern zend_module_entry ibase_module_entry;
@@ -194,11 +192,13 @@ typedef struct _php_ibase_varchar {
 
 enum php_interbase_option {
        PHP_IBASE_DEFAULT                       = 0,
-       PHP_IBASE_TEXT                          = 1,
        PHP_IBASE_UNIXTIME                      = 2,
        PHP_IBASE_TIMESTAMP             = 4,
        PHP_IBASE_DATE                          = 8,
        PHP_IBASE_TIME                          = 16,
+       /* fetch args */
+       PHP_IBASE_FETCH_BLOBS           = 1,
+       PHP_IBASE_FETCH_ARRAYS      = 2,
        /* transactions */      
        PHP_IBASE_WRITE                         = 2,
        PHP_IBASE_READ                          = 4,
@@ -221,8 +221,6 @@ enum php_interbase_option {
 
 #define phpext_interbase_ptr NULL
 
-#endif /* HAVE_IBASE */
-
 #endif /* PHP_INTERBASE_H */
 
 /*