CVS update: php3/functions

Date: Sunday October 25, 1998 @ 9:07 Author: danny Update of /repository/php3/functions In directory asf:/u2/tmp/cvs-serv13061/functions Modified Files: ifx.ec Log Message: Some "$ifdefs" to let ifx.ec compile for Online 7 again. Index: php3/functions/ifx.ec diff -c php3/functions/ifx.ec:1.30 php3/functions/ifx.ec:1.31 *** php3/functions/ifx.ec:1.30 Sat Oct 24 15:02:04 1998 --- php3/functions/ifx.ec Sun Oct 25 09:07:45 1998 *************** *** 917,923 **** --- 917,927 ---- loc_t *locator; int loc_t_type=CLOCATORTYPE; /* WORKAROUND:TYPE=CLOCATORTYPE doesn't work, don't ask me, why. */ + + $ifdef HAVE_IFX_IUS; fixed binary 'blob' ifx_lo_t *slocator; + $endif; + EXEC SQL END DECLARE SECTION; char *blobfilename; *************** *** 1185,1191 **** locind = 0; for (i = 1; i <= fieldcount; ++i) { EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldtype = TYPE; ! if ((fieldtype == SQLTEXT) || (fieldtype == SQLBYTES) || fieldtype==SQLUDTFIXED) { int bid; if(fieldtype==SQLTEXT) { --- 1189,1200 ---- locind = 0; for (i = 1; i <= fieldcount; ++i) { EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldtype = TYPE; ! if ( ! (fieldtype == SQLTEXT) || (fieldtype == SQLBYTES) ! $ifdef HAVE_IFX_IUS; ! || (fieldtype==SQLUDTFIXED) ! $endif; ! ) { int bid; if(fieldtype==SQLTEXT) { *************** *** 1207,1217 **** --- 1216,1228 ---- } EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator; } + $ifdef HAVE_IFX_IUS; if(fieldtype==SQLUDTFIXED) { bid=php3_intifxus_new_slob(list); slocator=php3_intifxus_get_slobloc(bid,list); EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*slocator; } + $endif; Ifx_Result->res_id[locind]=bid; ++locind; } *************** *** 1261,1267 **** --- 1272,1282 ---- loc_t *locator; int loc_t_type=CLOCATORTYPE; /* WORKAROUND: TYPE=CLOCATORTYPE doesn't work, don't ask me, why. */ + + $ifdef HAVE_IFX_IUS; fixed binary 'blob' ifx_lo_t *slocator; + $endif; + EXEC SQL END DECLARE SECTION; char *blobfilename; *************** *** 1512,1518 **** --- 1527,1537 ---- int i; /* field index */ short fieldtype; loc_t *locator; + + $ifdef HAVE_IFX_IUS; fixed binary 'blob' ifx_lo_t *slocator; + $endif; + EXEC SQL END DECLARE SECTION; int locind; *************** *** 1600,1606 **** locind = 0; for (i = 1; i <= fieldcount; ++i) { EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldtype = TYPE; ! if ((fieldtype == SQLTEXT) || (fieldtype == SQLBYTES) || fieldtype==SQLUDTFIXED) { int bid; if(fieldtype==SQLTEXT) { --- 1619,1630 ---- locind = 0; for (i = 1; i <= fieldcount; ++i) { EXEC SQL GET DESCRIPTOR :descrpid VALUE :i :fieldtype = TYPE; ! if ( ! (fieldtype == SQLTEXT) || (fieldtype == SQLBYTES) ! $ifdef HAVE_IFX_IUS; ! || (fieldtype==SQLUDTFIXED) ! $endif; ! ) { int bid; if(fieldtype==SQLTEXT) { *************** *** 1622,1632 **** --- 1646,1658 ---- } EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*locator; } + $ifdef HAVE_IFX_IUS; if(fieldtype==SQLUDTFIXED) { bid=php3_intifxus_new_slob(list); slocator=php3_intifxus_get_slobloc(bid,list); EXEC SQL SET DESCRIPTOR :descrpid VALUE :i DATA = :*slocator; } + $endif; Ifx_Result->res_id[locind]=bid; ++locind; } *************** *** 1841,1847 **** --- 1867,1877 ---- decimal dec_data = {0}; short short_data; loc_t *locator, *locator_b; + + $ifdef HAVE_IFX_IUS; fixed binary 'blob' ifx_lo_t *slocator; + $endif; + float float_data; double double_data; int fetch_row; *************** *** 2003,2009 **** ++locind; continue; } ! if(fieldtype==SQLTEXT || fieldtype==SQLBYTES || fieldtype==SQLUDTFIXED) { ++locind; } add_assoc_string(return_value, fieldname, nullstr, DUP); --- 2033,2044 ---- ++locind; continue; } ! if ( ! (fieldtype==SQLTEXT) || (fieldtype==SQLBYTES) ! $ifdef HAVE_IFX_IUS; ! || (fieldtype==SQLUDTFIXED) ! $endif; ! ) { ++locind; } add_assoc_string(return_value, fieldname, nullstr, DUP); *************** *** 2101,2106 **** --- 2136,2142 ---- char_data = NULL; break; + $ifdef HAVE_IFX_IUS; case SQLUDTFIXED : bid_b=Ifx_Result->res_id[locind]; add_assoc_long(return_value,fieldname,bid_b); *************** *** 2111,2116 **** --- 2147,2153 ---- Ifx_Result->res_id[locind]=bid; ++locind; break; + $endif; case SQLBYTES : case SQLTEXT : /* NULL has already been dealt with */ -- PHP Development Mailing List http://www.php.net/ To unsubscribe send an empty message to php-dev-unsubscribe@lists.php.net For help: php-dev-help@lists.php.net