From 17765221dfb8282371dbbc7b05fc0bcf9a23b37e Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Tue, 4 Sep 2001 07:41:20 +0000 Subject: - Fix namespace collisions. --- ext/sybase/php_sybase_db.h | 38 -------------------------------------- 1 file changed, 38 deletions(-) (limited to 'ext/sybase/php_sybase_db.h') diff --git a/ext/sybase/php_sybase_db.h b/ext/sybase/php_sybase_db.h index a622e1222a..265ec09f59 100644 --- a/ext/sybase/php_sybase_db.h +++ b/ext/sybase/php_sybase_db.h @@ -63,21 +63,6 @@ PHP_FUNCTION(sybase_field_type); PHP_FUNCTION(sybase_field_flags); - -#include -#include -#include - -#define coltype(j) dbcoltype(sybase_ptr->link,j) -#define intcol(i) ((int) *(DBINT *) dbdata(sybase_ptr->link,i)) -#define smallintcol(i) ((int) *(DBSMALLINT *) dbdata(sybase_ptr->link,i)) -#define tinyintcol(i) ((int) *(DBTINYINT *) dbdata(sybase_ptr->link,i)) -#define anyintcol(j) (coltype(j)==SYBINT4?intcol(j):(coltype(j)==SYBINT2?smallintcol(j):tinyintcol(j))) -#define charcol(i) ((DBCHAR *) dbdata(sybase_ptr->link,i)) -#define floatcol(i) ((float) *(DBFLT8 *) dbdata(sybase_ptr->link,i)) - -typedef struct sybase_link_struct sybase_link; - typedef struct { long default_link; long num_links,num_persistent; @@ -91,29 +76,6 @@ typedef struct { long compatability_mode; } sybase_module; -struct sybase_link_struct { - LOGINREC *login; - DBPROCESS *link; - int valid; -}; - -#define SYBASE_ROWS_BLOCK 128 - -typedef struct { - char *name,*column_source; - int max_length, numeric; - int type; -} sybase_field; - -typedef struct { - pval ***data; - sybase_field *fields; - sybase_link *sybase_ptr; - int cur_row,cur_field; - int num_rows,num_fields; -} sybase_result; - - extern sybase_module php_sybase_module; #else -- cgit v1.2.1