Fine-tune FB_API_VER guards

Author: mlazdans

firebird_utils.cpp

@@ -17,8 +17,7 @@
 
 #include <ibase.h>
 
-#if FB_API_VER >= 40
-
+#if FB_API_VER >= 30
 #include <firebird/Interface.h>
 #include <cstring>
 #include "php.h"
@@ -57,6 +56,9 @@ static void fbu_copy_status(const ISC_STATUS* from, ISC_STATUS* to, size_t maxLe
 	}
 }
 
+#endif // FB_API_VER >= 30
+
+#if FB_API_VER >= 40
 /* Decodes a time with time zone into its time components. */
 extern "C" void fbu_decode_time_tz(void *master_ptr, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
    unsigned timeZoneBufferLength, char* timeZoneBuffer)

firebird_utils.h

@@ -17,34 +17,41 @@
 #ifndef PDO_FIREBIRD_UTILS_H
 #define PDO_FIREBIRD_UTILS_H
 
-#if FB_API_VER >= 40
-
-#include <ibase.h>
-#include "php_ibase_includes.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+
+#if FB_API_VER >= 30
+
+#include <ibase.h>
+#include "php_ibase_includes.h"
+
 unsigned fbu_get_client_version(void *master_ptr);
-ISC_TIME fbu_encode_time(void *master_ptr, unsigned hours, unsigned minutes, unsigned seconds, unsigned fractions);
+ISC_TIME fbu_encode_time(void *master_ptr, unsigned hours, unsigned minutes,
+  unsigned seconds, unsigned fractions);
 ISC_DATE fbu_encode_date(void *master_ptr, unsigned year, unsigned month, unsigned day);
 
+#endif // FB_API_VER >= 30
+
+
+#if FB_API_VER >= 40
 void fbu_decode_time_tz(void *master_ptr, const ISC_TIME_TZ* timeTz, unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
 	unsigned timeZoneBufferLength, char* timeZoneBuffer);
-
 void fbu_decode_timestamp_tz(void *master_ptr, const ISC_TIMESTAMP_TZ* timestampTz,
 	unsigned* year, unsigned* month, unsigned* day,
 	unsigned* hours, unsigned* minutes, unsigned* seconds, unsigned* fractions,
 	unsigned timeZoneBufferLength, char* timeZoneBuffer);
+int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num,
+  zval *into_array, void *statement_ptr);
+int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query,
+  void *statement_ptr);
+
+#endif // FB_API_VER >= 30
 
-int fbu_insert_aliases(void *master_ptr, ISC_STATUS* st, ibase_query *ib_query, void *statement_ptr);
-int fbu_insert_field_info(void *master_ptr, ISC_STATUS* st, int is_outvar, int num, zval *into_array, void *statement_ptr);
 
 #ifdef __cplusplus
 }
 #endif
 
-#endif // FB_API_VER >= 40
-
 #endif	/* PDO_FIREBIRD_UTILS_H */

interbase.c

@@ -16,6 +16,7 @@
    |          Andrew Avdeev <andy@simgts.mv.ru>                           |
    |          Ard Biesheuvel <a.k.biesheuvel@its.tudelft.nl>              |
    |          Martin Koeditz <martin.koeditz@it-syn.de>                   |
+   |          Martins Lazdans <marrtins@dqdp.net>                         |
    |          others                                                      |
    +----------------------------------------------------------------------+
    | You'll find history on Github                                        |
@@ -839,17 +840,21 @@ static PHP_GINIT_FUNCTION(ibase)
 	ibase_globals->get_master_interface = _php_ibase_get_fbclient_symbol("fb_get_master_interface");
 	ibase_globals->get_statement_interface = _php_ibase_get_fbclient_symbol("fb_get_statement_interface");
 
+#if FB_API_VER >= 30
 	if (ibase_globals->get_master_interface) {
 		ibase_globals->master_instance = ((fb_get_master_interface_t)(ibase_globals->get_master_interface))();
 		ibase_globals->client_version = fbu_get_client_version(ibase_globals->master_instance);
 		ibase_globals->client_major_version = (ibase_globals->client_version >> 8) & 0xFF;
 		ibase_globals->client_minor_version = ibase_globals->client_version & 0xFF;
 	} else {
+#endif
 		ibase_globals->master_instance = NULL;
 		ibase_globals->client_version = -1;
 		ibase_globals->client_major_version = -1;
 		ibase_globals->client_minor_version = -1;
+#if FB_API_VER >= 30
 	}
+#endif
 }
 
 PHP_MINIT_FUNCTION(ibase)