cvs: php-src /ext/interbase php_ibase_includes.h
| From: | Ard Biesheuvel | Date: | Sun, 04 Apr 2004 13:51:56 +0000 |
| Subject: | cvs: php-src /ext/interbase php_ibase_includes.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-26952@lists.php.net to get a copy of this message | ||
abies Sun Apr 4 09:51:56 2004 EDT
Modified files:
/php-src/ext/interbase php_ibase_includes.h
Log:
CS
http://cvs.php.net/diff.php/php-src/ext/interbase/php_ibase_includes.h?r1=1.4&r2=1.5&ty=u
Index: php-src/ext/interbase/php_ibase_includes.h
diff -u php-src/ext/interbase/php_ibase_includes.h:1.4
php-src/ext/interbase/php_ibase_includes.h:1.5
--- php-src/ext/interbase/php_ibase_includes.h:1.4 Mon Mar 8 05:32:26 2004
+++ php-src/ext/interbase/php_ibase_includes.h Sun Apr 4 09:51:56 2004
@@ -18,10 +18,10 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_ibase_includes.h,v 1.4 2004/03/08 10:32:26 abies Exp $ */
+/* $Id: php_ibase_includes.h,v 1.5 2004/04/04 13:51:56 abies Exp $ */
-#ifndef INTERBASE_H
-#define INTERBASE_H
+#ifndef PHP_IBASE_INCLUDES_H
+#define PHP_IBASE_INCLUDES_H
#include <ibase.h>
@@ -42,7 +42,7 @@
#endif /* PHP_WIN32 */
#endif /* SQL_DIALECT_CURRENT */
-#define RESET_ERRMSG { IBG(errmsg)[0] = '\0'; IBG(sql_code) = 0; }
+#define RESET_ERRMSG do { IBG(errmsg)[0] = '\0'; IBG(sql_code) = 0; } while (0)
#define IB_STATUS (IBG(status))
@@ -197,16 +197,16 @@
void _php_ibase_error(TSRMLS_D);
void _php_ibase_module_error(char * TSRMLS_DC, ...)
- PHP_ATTRIBUTE_FORMAT(printf,1,PHP_ATTR_FMT_OFFSET +2);
+ PHP_ATTRIBUTE_FORMAT(printf,1,PHP_ATTR_FMT_OFFSET +2);
/* determine if a resource is a link or transaction handle */
-#define PHP_IBASE_LINK_TRANS(pzval, lh, th) \
- do { if (!pzval) { \
- ZEND_FETCH_RESOURCE2(lh, ibase_db_link *, NULL, IBG(default_link), \
- "InterBase link", le_link, le_plink) } \
- else \
- _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, &pzval, &lh, &th); \
- if (SUCCESS != _php_ibase_def_trans(lh, &th TSRMLS_CC)) { RETURN_FALSE; } \
+#define PHP_IBASE_LINK_TRANS(pzval, lh, th) \
+ do { if (!pzval) { \
+ ZEND_FETCH_RESOURCE2(lh, ibase_db_link *, NULL, IBG(default_link), \
+ "InterBase link", le_link, le_plink) } \
+ else \
+ _php_ibase_get_link_trans(INTERNAL_FUNCTION_PARAM_PASSTHRU, &pzval, &lh, &th); \
+ if (SUCCESS != _php_ibase_def_trans(lh, &th TSRMLS_CC)) { RETURN_FALSE; } \
} while (0)
int _php_ibase_def_trans(ibase_db_link *ib_link, ibase_trans **trans TSRMLS_DC);
@@ -219,7 +219,7 @@
#define max(a,b) ((a)>(b)?(a):(b))
#endif
-#endif /* INTERBASE_H */
+#endif /* PHP_IBASE_INCLUDES_H */
/*
* Local variables: