Gentoo Attachment #93546 for bug #120867

View | Details | Raw Unified
Collapse All | Expand All

(-) firebird-1.5.3.4870.old/src/alice/alice.cpp (-1 / +1 lines)

Lines 129-135	Link Here

		ALICE_gfix(	service->svc_argc,

		ALICE_gfix(	service->svc_argc,

					service->svc_argv,

					service->svc_argv,

					output_thread,

					output_thread,

					(SLONG) service);

					(SLONG)(IPTR) service);

//  Mark service thread as finished.

//  Mark service thread as finished.

//  If service is detached, cleanup memory being used by service.

//  If service is detached, cleanup memory being used by service.

(-) firebird-1.5.3.4870.old/src/burp/burp.cpp (-1 / +1 lines)

Lines 181-187	Link Here

	int exit_code;

	int exit_code;

	exit_code = BURP_gbak(service->svc_argc, service->svc_argv,

	exit_code = BURP_gbak(service->svc_argc, service->svc_argv,

						  output_netware, (SLONG) service);

						  output_netware, (SLONG) (IPTR) service);

/* Mark service thread as finished. */

/* Mark service thread as finished. */

/* If service is detached, cleanup memory being used by service. */

/* If service is detached, cleanup memory being used by service. */

(-) firebird-1.5.3.4870.old/src/burp/canonical.cpp (-1 / +1 lines)

Lines 502-508	Link Here

	UCHAR *p;

	UCHAR *p;

	SSHORT n;

	SSHORT n;

	p = buffer + (int) desc->dsc_address;

	p = buffer + (int) (IPTR)desc->dsc_address;

	switch (desc->dsc_dtype)

	switch (desc->dsc_dtype)

(-) firebird-1.5.3.4870.old/src/dsql/ddl.cpp (-33 / +33 lines)

Lines 1126-1137	Link Here

	if (constant)

	if (constant)

		request->append_number(gds_dyn_trg_sequence,

		request->append_number(gds_dyn_trg_sequence,

				   (SSHORT)(SLONG) (constant ? constant->nod_arg[0] : 0));

				   (SSHORT)(SLONG)(IPTR) (constant ? constant->nod_arg[0] : 0));

	if ((constant = node->nod_arg[e_cnstr_type]) != NULL)

	if ((constant = node->nod_arg[e_cnstr_type]) != NULL)

		const SSHORT type = (SSHORT)(SLONG) constant->nod_arg[0];

		const SSHORT type = (SSHORT)(SLONG)(IPTR) constant->nod_arg[0];

		request->append_number(gds_dyn_trg_type, type);

		request->append_number(gds_dyn_trg_type, type);

Lines 1270-1276	Link Here

			switch (element->nod_type) {

			switch (element->nod_type) {

			case nod_file_length:

			case nod_file_length:

				start = (SLONG) (element->nod_arg[0]) + 1;

				start = (SLONG) (IPTR) (element->nod_arg[0]) + 1;

				break;

				break;

			default:

			default:

Lines 1336-1360	Link Here

			case nod_group_commit_wait:

			case nod_group_commit_wait:

				request->append_uchar(gds_dyn_log_group_commit_wait);

				request->append_uchar(gds_dyn_log_group_commit_wait);

				temp_long = (SLONG) (element->nod_arg[0]);

				temp_long = (SLONG) (IPTR) (element->nod_arg[0]);

				request->append_ulong_with_length(temp_long);

				request->append_ulong_with_length(temp_long);

				break;

				break;

			case nod_check_point_len:

			case nod_check_point_len:

				request->append_uchar(gds_dyn_log_check_point_length);

				request->append_uchar(gds_dyn_log_check_point_length);

				temp_long = (SLONG) (element->nod_arg[0]);

				temp_long = (SLONG) (IPTR) (element->nod_arg[0]);

				request->append_ulong_with_length(temp_long);

				request->append_ulong_with_length(temp_long);

				break;

				break;

			case nod_num_log_buffers:

			case nod_num_log_buffers:

				request->append_uchar(gds_dyn_log_num_of_buffers);

				request->append_uchar(gds_dyn_log_num_of_buffers);

				temp_short = (SSHORT)(SLONG) (element->nod_arg[0]);

				temp_short = (SSHORT)(SLONG) (IPTR) (element->nod_arg[0]);

				request->append_ushort_with_length(temp_short);

				request->append_ushort_with_length(temp_short);

				break;

				break;

			case nod_log_buffer_size:

			case nod_log_buffer_size:

				request->append_uchar(gds_dyn_log_buffer_size);

				request->append_uchar(gds_dyn_log_buffer_size);

				temp_short = (SSHORT)(SLONG) (element->nod_arg[0]);

				temp_short = (SSHORT)(SLONG) (IPTR) (element->nod_arg[0]);

				request->append_ushort_with_length(temp_short);

				request->append_ushort_with_length(temp_short);

				break;

				break;

Lines 1637-1647	Link Here

		request->append_number(gds_dyn_def_dimension, position);

		request->append_number(gds_dyn_def_dimension, position);

		DSQL_NOD element = *ptr++;

		DSQL_NOD element = *ptr++;

		request->append_uchar(gds_dyn_dim_lower);

		request->append_uchar(gds_dyn_dim_lower);

		SLONG lrange = (SLONG) (element->nod_arg[0]);

		SLONG lrange = (SLONG) (IPTR) (element->nod_arg[0]);

		request->append_ulong_with_length(lrange);

		request->append_ulong_with_length(lrange);

		element = *ptr;

		element = *ptr;

		request->append_uchar(gds_dyn_dim_upper);

		request->append_uchar(gds_dyn_dim_upper);

		SLONG hrange = (SLONG) (element->nod_arg[0]);

		SLONG hrange = (SLONG) (IPTR) (element->nod_arg[0]);

		request->append_ulong_with_length(hrange);

		request->append_ulong_with_length(hrange);

		request->append_uchar(gds_dyn_end);

		request->append_uchar(gds_dyn_end);

		if (lrange >= hrange)

		if (lrange >= hrange)

Lines 2062-2070	Link Here

	request->append_cstring(gds_dyn_def_filter,

	request->append_cstring(gds_dyn_def_filter,

				((STR) (ptr[e_filter_name]))->str_data);

				((STR) (ptr[e_filter_name]))->str_data);

	request->append_number(gds_dyn_filter_in_subtype,

	request->append_number(gds_dyn_filter_in_subtype,

			   (SSHORT)(SLONG) ((ptr[e_filter_in_type])->nod_arg[0]));

			   (SSHORT)(SLONG) (IPTR) ((ptr[e_filter_in_type])->nod_arg[0]));

	request->append_number(gds_dyn_filter_out_subtype,

	request->append_number(gds_dyn_filter_out_subtype,

			   (SSHORT)(SLONG) ((ptr[e_filter_out_type])->nod_arg[0]));

			   (SSHORT)(SLONG) (IPTR) ((ptr[e_filter_out_type])->nod_arg[0]));

	request->append_cstring(gds_dyn_func_entry_point,

	request->append_cstring(gds_dyn_func_entry_point,

				((STR) (ptr[e_filter_entry_pt]))->str_data);

				((STR) (ptr[e_filter_entry_pt]))->str_data);

	request->append_cstring(gds_dyn_func_module_name,

	request->append_cstring(gds_dyn_func_module_name,

Lines 2670-2685	Link Here

				  gds_arg_gds, gds_dsql_shadow_number_err, 0);

				  gds_arg_gds, gds_dsql_shadow_number_err, 0);

	request->append_number(gds_dyn_def_shadow, (SSHORT)(SLONG) (ptr[e_shadow_number]));

	request->append_number(gds_dyn_def_shadow, (SSHORT)(SLONG) (IPTR) (ptr[e_shadow_number]));

	request->append_cstring(gds_dyn_def_file, ((STR) (ptr[e_shadow_name]))->str_data);

	request->append_cstring(gds_dyn_def_file, ((STR) (ptr[e_shadow_name]))->str_data);

	request->append_number(gds_dyn_shadow_man_auto,

	request->append_number(gds_dyn_shadow_man_auto,

			   (SSHORT)(SLONG) ((ptr[e_shadow_man_auto])->nod_arg[0]));

			   (SSHORT)(SLONG) (IPTR) ((ptr[e_shadow_man_auto])->nod_arg[0]));

	request->append_number(gds_dyn_shadow_conditional,

	request->append_number(gds_dyn_shadow_conditional,

			   (SSHORT)(SLONG) ((ptr[e_shadow_conditional])->nod_arg[0]));

			   (SSHORT)(SLONG) (IPTR) ((ptr[e_shadow_conditional])->nod_arg[0]));

	request->append_file_start(0);

	request->append_file_start(0);

	SLONG length = (SLONG) ptr[e_shadow_length];

	SLONG length = (SLONG) (IPTR) ptr[e_shadow_length];

	request->append_file_length(length);

	request->append_file_length(length);

	request->append_uchar(gds_dyn_end);

	request->append_uchar(gds_dyn_end);

Lines 2806-2820	Link Here

	if (constant = node->nod_arg[e_trg_active])

	if (constant = node->nod_arg[e_trg_active])

		request->append_number(gds_dyn_trg_inactive,

		request->append_number(gds_dyn_trg_inactive,

				   (SSHORT)(SLONG) constant->nod_arg[0]);

				   (SSHORT)(SLONG) (IPTR) constant->nod_arg[0]);

	if (constant = node->nod_arg[e_trg_position])

	if (constant = node->nod_arg[e_trg_position])

		request->append_number(gds_dyn_trg_sequence,

		request->append_number(gds_dyn_trg_sequence,

				   (SSHORT)(SLONG) constant->nod_arg[0]);

				   (SSHORT)(SLONG) (IPTR) constant->nod_arg[0]);

	if (constant = node->nod_arg[e_trg_type]) {

	if (constant = node->nod_arg[e_trg_type]) {

		request->append_number(gds_dyn_trg_type, (SSHORT)(SLONG) constant->nod_arg[0]);

		request->append_number(gds_dyn_trg_type, (SSHORT)(SLONG) (IPTR) constant->nod_arg[0]);

		trig_type = (USHORT)(ULONG) constant->nod_arg[0];

		trig_type = (USHORT)(ULONG) (IPTR) constant->nod_arg[0];

	else {

	else {

		assert(node->nod_type == nod_mod_trigger);

		assert(node->nod_type == nod_mod_trigger);

Lines 2893-2899	Link Here

		for (DSQL_NOD* ptr = temp->nod_arg; ptr < end; ++ptr)

		for (DSQL_NOD* ptr = temp->nod_arg; ptr < end; ++ptr)

			DSQL_NOD    message = *ptr;

			DSQL_NOD    message = *ptr;

			SSHORT number  = (SSHORT)(SLONG) message->nod_arg[e_msg_number];

			SSHORT number  = (SSHORT)(SLONG) (IPTR) message->nod_arg[e_msg_number];

			if (message->nod_type == nod_del_trigger_msg)

			if (message->nod_type == nod_del_trigger_msg)

				request->append_number(gds_dyn_delete_trigger_msg, number);

				request->append_number(gds_dyn_delete_trigger_msg, number);

Lines 2954-2960	Link Here

        // CVC: This is case of "returns <type> [by value|reference]"

        // CVC: This is case of "returns <type> [by value|reference]"

		/* Some data types can not be returned as value */

		/* Some data types can not be returned as value */

		if (((int)(SLONG) (ret_val_ptr[1]->nod_arg[0]) == FUN_value) &&

		if (((int)(SLONG) (IPTR) (ret_val_ptr[1]->nod_arg[0]) == FUN_value) &&

			(field->fld_dtype == dtype_text ||

			(field->fld_dtype == dtype_text ||

			 field->fld_dtype == dtype_varying ||

			 field->fld_dtype == dtype_varying ||

			 field->fld_dtype == dtype_cstring ||

			 field->fld_dtype == dtype_cstring ||

Lines 2998-3004	Link Here

        // CVC: This is case of "returns parameter <N>"

        // CVC: This is case of "returns parameter <N>"

		position = (SSHORT)(SLONG) (ret_val_ptr[1]->nod_arg[0]);

		position = (SSHORT)(SLONG) (IPTR) (ret_val_ptr[1]->nod_arg[0]);

		/* Function modifies an argument whose value is the function return value */

		/* Function modifies an argument whose value is the function return value */

		if (!arguments || position > arguments->nod_count || position < 1) {

		if (!arguments || position > arguments->nod_count || position < 1) {

Lines 3024-3030	Link Here

		if (field->fld_dtype == dtype_blob)

		if (field->fld_dtype == dtype_blob)

        /* CVC: I need to test returning blobs by descriptor before allowing the        change there. For now, I ignore the return type specification. */

        /* CVC: I need to test returning blobs by descriptor before allowing the        change there. For now, I ignore the return type specification. */

			BOOLEAN free_it = ((SSHORT)(SLONG) ret_val_ptr[1]->nod_arg[0] < 0);

			BOOLEAN free_it = ((SSHORT)(SLONG) (IPTR) ret_val_ptr[1]->nod_arg[0] < 0);

			request->append_number(gds_dyn_def_function_arg, blob_position);

			request->append_number(gds_dyn_def_function_arg, blob_position);

			request->append_number(gds_dyn_func_mechanism,

			request->append_number(gds_dyn_func_mechanism,

					   (SSHORT)(SLONG) ((free_it ? -1 : 1) * FUN_blob_struct));

					   (SSHORT)(SLONG) ((free_it ? -1 : 1) * FUN_blob_struct));

Lines 3035-3041	Link Here

			request->append_number(gds_dyn_def_function_arg, (SSHORT) 0);

			request->append_number(gds_dyn_def_function_arg, (SSHORT) 0);

			request->append_number(gds_dyn_func_mechanism,

			request->append_number(gds_dyn_func_mechanism,

					   (SSHORT)(SLONG) (ret_val_ptr[1]->nod_arg[0]));

					   (SSHORT)(SLONG) (IPTR) (ret_val_ptr[1]->nod_arg[0]));

		request->append_cstring(gds_dyn_function_name, udf_name);

		request->append_cstring(gds_dyn_function_name, udf_name);

Lines 3070-3076	Link Here

			request->append_number(gds_dyn_def_function_arg, (SSHORT) position);

			request->append_number(gds_dyn_def_function_arg, (SSHORT) position);

            if (param_node [e_udf_param_type]) {

            if (param_node [e_udf_param_type]) {

                SSHORT arg_mechanism = (SSHORT)(SLONG) (param_node [e_udf_param_type]->nod_arg [0]);

                SSHORT arg_mechanism = (SSHORT)(SLONG) (IPTR) (param_node [e_udf_param_type]->nod_arg [0]);

				request->append_number(gds_dyn_func_mechanism, arg_mechanism);

				request->append_number(gds_dyn_func_mechanism, arg_mechanism);

            else if (field->fld_dtype == dtype_blob) {

            else if (field->fld_dtype == dtype_blob) {

Lines 3677-3689	Link Here

	if (constant)

	if (constant)

		request->append_number(gds_dyn_trg_sequence,

		request->append_number(gds_dyn_trg_sequence,

				   (SSHORT)(SLONG) (constant ? constant->nod_arg[0] : 0));

				   (SSHORT)(SLONG) (IPTR) (constant ? constant->nod_arg[0] : 0));

	constant = node->nod_arg[e_cnstr_type];

	constant = node->nod_arg[e_cnstr_type];

	if (constant)

	if (constant)

		trig_type = (USHORT)(ULONG) constant->nod_arg[0];

		trig_type = (USHORT)(ULONG)(IPTR) constant->nod_arg[0];

		request->append_number(gds_dyn_trg_type, trig_type);

		request->append_number(gds_dyn_trg_type, trig_type);

	else

	else

Lines 4173-4179	Link Here

	case nod_del_shadow:

	case nod_del_shadow:

		request->append_number(gds_dyn_delete_shadow,

		request->append_number(gds_dyn_delete_shadow,

				   (SSHORT)(SLONG) (node->nod_arg[0]));

				   (SSHORT)(SLONG) (IPTR) (node->nod_arg[0]));

		request->append_uchar(gds_dyn_end);

		request->append_uchar(gds_dyn_end);

		break;

		break;

Lines 4611-4635	Link Here

		case nod_group_commit_wait:

		case nod_group_commit_wait:

			request->append_uchar(gds_dyn_log_group_commit_wait);

			request->append_uchar(gds_dyn_log_group_commit_wait);

			temp_long = (SLONG) (element->nod_arg[0]);

			temp_long = (SLONG)(IPTR) (element->nod_arg[0]);

			request->append_ulong_with_length(temp_long);

			request->append_ulong_with_length(temp_long);

			break;

			break;

		case nod_check_point_len:

		case nod_check_point_len:

			request->append_uchar(gds_dyn_log_check_point_length);

			request->append_uchar(gds_dyn_log_check_point_length);

			temp_long = (SLONG) (element->nod_arg[0]);

			temp_long = (SLONG)(IPTR) (element->nod_arg[0]);

			request->append_ulong_with_length(temp_long);

			request->append_ulong_with_length(temp_long);

			break;

			break;

		case nod_num_log_buffers:

		case nod_num_log_buffers:

			request->append_uchar(gds_dyn_log_num_of_buffers);

			request->append_uchar(gds_dyn_log_num_of_buffers);

			temp_short = (SSHORT)(SLONG) (element->nod_arg[0]);

			temp_short = (SSHORT)(SLONG)(IPTR) (element->nod_arg[0]);

			request->append_ushort_with_length(temp_short);

			request->append_ushort_with_length(temp_short);

			break;

			break;

		case nod_log_buffer_size:

		case nod_log_buffer_size:

			request->append_uchar(gds_dyn_log_buffer_size);

			request->append_uchar(gds_dyn_log_buffer_size);

			temp_short = (SSHORT)(SLONG) (element->nod_arg[0]);

			temp_short = (SSHORT)(SLONG)(IPTR) (element->nod_arg[0]);

			request->append_ushort_with_length(temp_short);

			request->append_ushort_with_length(temp_short);

			break;

			break;

		case nod_drop_log:

		case nod_drop_log:

Lines 5095-5101	Link Here

				const_node = element->nod_arg[e_mod_fld_pos_new_position];

				const_node = element->nod_arg[e_mod_fld_pos_new_position];

                /* CVC: Since now the parser accepts pos=1..N, let's subtract one here. */

                /* CVC: Since now the parser accepts pos=1..N, let's subtract one here. */

                constant = (SSHORT)(SLONG) const_node->nod_arg [0] - 1;

                constant = (SSHORT)(SLONG) (IPTR) const_node->nod_arg [0] - 1;

				request->append_cstring(gds_dyn_rel_name,

				request->append_cstring(gds_dyn_rel_name,

							relation_name->str_data);

							relation_name->str_data);

(-) firebird-1.5.3.4870.old/src/dsql/dsql.cpp (-7 / +7 lines)

Lines 1136-1143	Link Here

			parameter = request->req_blob->blb_segment;

			parameter = request->req_blob->blb_segment;

			PAR null = parameter->par_null;

			PAR null = parameter->par_null;

			USHORT* ret_length =

			USHORT* ret_length =

				(USHORT *) (dsql_msg + (SLONG) null->par_user_desc.dsc_address);

				(USHORT *) (dsql_msg + (SLONG) (IPTR) null->par_user_desc.dsc_address);

			UCHAR* buffer = dsql_msg + (SLONG) parameter->par_user_desc.dsc_address;

			UCHAR* buffer = dsql_msg + (SLONG) (IPTR) parameter->par_user_desc.dsc_address;

			THREAD_EXIT;

			THREAD_EXIT;

			s = isc_get_segment(tdsql->tsql_status,

			s = isc_get_segment(tdsql->tsql_status,

							GDS_REF(request->req_handle),

							GDS_REF(request->req_handle),

Lines 1314-1320	Link Here

			parameter = request->req_blob->blb_segment;

			parameter = request->req_blob->blb_segment;

			buffer =

			buffer =

				reinterpret_cast<SCHAR*>(

				reinterpret_cast<SCHAR*>(

					dsql_msg + (SLONG) parameter->par_user_desc.dsc_address);

					dsql_msg + (SLONG) (IPTR) parameter->par_user_desc.dsc_address);

			THREAD_EXIT;

			THREAD_EXIT;

			s = isc_put_segment(tdsql->tsql_status,

			s = isc_put_segment(tdsql->tsql_status,

							GDS_REF(request->req_handle),

							GDS_REF(request->req_handle),

Lines 3210-3216	Link Here

	PAR parameter, null;

	PAR parameter, null;

	if (node->nod_type == nod_constant)

	if (node->nod_type == nod_constant)

		return (SSHORT)(SLONG) node->nod_arg[0];

		return (SSHORT)(SLONG) (IPTR) node->nod_arg[0];

	parameter = (PAR) node->nod_arg[e_par_parameter];

	parameter = (PAR) node->nod_arg[e_par_parameter];

	if (null = parameter->par_null)

	if (null = parameter->par_null)

Lines 3976-3982	Link Here

			 /* Make sure the message given to us is long enough */

			 /* Make sure the message given to us is long enough */

			DSC    desc   = parameter->par_user_desc;

			DSC    desc   = parameter->par_user_desc;

			USHORT length = (SLONG) desc.dsc_address + desc.dsc_length;

			USHORT length = (SLONG) (IPTR) desc.dsc_address + desc.dsc_length;

			if (length > msg_length)

			if (length > msg_length)

				break;

				break;

			if (!desc.dsc_dtype)

			if (!desc.dsc_dtype)

Lines 3985-3991	Link Here

			flag = NULL;

			flag = NULL;

			if ((null = parameter->par_null) != NULL)

			if ((null = parameter->par_null) != NULL)

				USHORT null_offset = (USHORT)(ULONG) (null->par_user_desc.dsc_address);

				USHORT null_offset = (USHORT)(ULONG) (IPTR) (null->par_user_desc.dsc_address);

				length = null_offset + sizeof(SSHORT);

				length = null_offset + sizeof(SSHORT);

				if (length > msg_length)

				if (length > msg_length)

					break;

					break;

Lines 4000-4006	Link Here

			desc.dsc_address = dsql_msg + (SLONG) desc.dsc_address;

			desc.dsc_address = dsql_msg + (SLONG) (IPTR) desc.dsc_address;

			if (!request)

			if (!request)

				MOVD_move(&parameter->par_desc, &desc);

				MOVD_move(&parameter->par_desc, &desc);

			else if (!flag || *flag >= 0)

			else if (!flag || *flag >= 0)

(-) firebird-1.5.3.4870.old/src/dsql/gen.cpp (-10 / +10 lines)

Lines 636-642	Link Here

	for (parameter = message->msg_parameters; parameter;

	for (parameter = message->msg_parameters; parameter;

		 parameter = parameter->par_next)

		 parameter = parameter->par_next)

			parameter->par_desc.dsc_address =

			parameter->par_desc.dsc_address =

			message->msg_buffer + (SLONG) parameter->par_desc.dsc_address;

			message->msg_buffer + (SLONG) (IPTR) parameter->par_desc.dsc_address;

Lines 1021-1027	Link Here

	case nod_exec_into:

	case nod_exec_into:

		if (node->nod_arg[e_exec_into_block]) {

		if (node->nod_arg[e_exec_into_block]) {

			STUFF(blr_label);

			STUFF(blr_label);

			STUFF((int)(SLONG) node->nod_arg[e_exec_into_number]);

			STUFF((int)(SLONG) (IPTR) node->nod_arg[e_exec_into_number]);

		STUFF(blr_exec_into);

		STUFF(blr_exec_into);

		temp = node->nod_arg[e_exec_into_list];

		temp = node->nod_arg[e_exec_into_list];

Lines 1049-1060	Link Here

    case nod_label:

    case nod_label:

        STUFF(blr_label);

        STUFF(blr_label);

        STUFF((int)(SLONG) node->nod_arg[e_label_number]);

        STUFF((int)(SLONG) (IPTR) node->nod_arg[e_label_number]);

        return;

        return;

    case nod_breakleave:

    case nod_breakleave:

        STUFF(blr_leave);

        STUFF(blr_leave);

        STUFF((int)(SLONG) node->nod_arg[e_breakleave_number]);

        STUFF((int)(SLONG)(IPTR) node->nod_arg[e_breakleave_number]);

        return;

        return;

	case nod_store:

	case nod_store:

Lines 1069-1075	Link Here

	case nod_abort:

	case nod_abort:

		STUFF(blr_leave);

		STUFF(blr_leave);

		STUFF((int)(SLONG) node->nod_arg[e_abrt_number]);

		STUFF((int)(SLONG) (IPTR) node->nod_arg[e_abrt_number]);

		return;

		return;

	case nod_start_savepoint:

	case nod_start_savepoint:

Lines 1149-1162	Link Here

	case nod_while:

	case nod_while:

		STUFF(blr_label);

		STUFF(blr_label);

		STUFF((int)(SLONG) node->nod_arg[e_while_number]);

		STUFF((int)(SLONG) (IPTR) node->nod_arg[e_while_number]);

		STUFF(blr_loop);

		STUFF(blr_loop);

		STUFF(blr_begin);

		STUFF(blr_begin);

		STUFF(blr_if);

		STUFF(blr_if);

		GEN_expr(request, node->nod_arg[e_while_cond]);

		GEN_expr(request, node->nod_arg[e_while_cond]);

		GEN_statement(request, node->nod_arg[e_while_action]);

		GEN_statement(request, node->nod_arg[e_while_action]);

		STUFF(blr_leave);

		STUFF(blr_leave);

		STUFF((int)(SLONG) node->nod_arg[e_while_number]);

		STUFF((int)(SLONG) (IPTR) node->nod_arg[e_while_number]);

		STUFF(blr_end);

		STUFF(blr_end);

		return;

		return;

Lines 1556-1562	Link Here

	switch (node->nod_type) {

	switch (node->nod_type) {

	case nod_sqlcode:

	case nod_sqlcode:

		STUFF(blr_sql_code);

		STUFF(blr_sql_code);

		STUFF_WORD((USHORT)(ULONG) node->nod_arg[0]);

		STUFF_WORD((USHORT)(ULONG) (IPTR) node->nod_arg[0]);

		return;

		return;

	case nod_gdscode:

	case nod_gdscode:

Lines 1667-1673	Link Here

       what loop is the user trying to abandon? */

       what loop is the user trying to abandon? */

    if (for_select->nod_arg [e_flp_action]) {

    if (for_select->nod_arg [e_flp_action]) {

        STUFF (blr_label);

        STUFF (blr_label);

        STUFF ((int) for_select->nod_arg [e_flp_number]);

        STUFF ((int) (IPTR) for_select->nod_arg [e_flp_number]);

/* Generate FOR loop */

/* Generate FOR loop */

Lines 2546-2552	Link Here

	for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end; ptr++) {

	for (ptr = list->nod_arg, end = ptr + list->nod_count; ptr < end; ptr++) {

 		dsql_nod* nulls_placement = (*ptr)->nod_arg[e_order_nulls];

 		dsql_nod* nulls_placement = (*ptr)->nod_arg[e_order_nulls];

 		if (nulls_placement) {

 		if (nulls_placement) {

 			switch ((SLONG)nulls_placement->nod_arg[0]) {

 			switch ((SLONG) (IPTR) nulls_placement->nod_arg[0]) {

 				case NOD_NULLS_FIRST:

 				case NOD_NULLS_FIRST:

 					STUFF(blr_nullsfirst);

 					STUFF(blr_nullsfirst);

 					break;

 					break;

(-) firebird-1.5.3.4870.old/src/dsql/parse.y (-37 / +37 lines)

Lines 551-557	Link Here

		| set

		| set

		| update

		| update

		| KW_DEBUG signed_short_integer

		| KW_DEBUG signed_short_integer

			{ prepare_console_debug ((int) $2, &yydebug);

			{ prepare_console_debug ((int)(IPTR) $2, &yydebug);

			  $$ = make_node (nod_null, (int) 0, NULL); }

			  $$ = make_node (nod_null, (int) 0, NULL); }

Lines 753-759	Link Here

		| CSTRING '(' pos_short_integer ')' charset_clause

		| CSTRING '(' pos_short_integer ')' charset_clause

			lex.g_field->fld_dtype = dtype_cstring;

			lex.g_field->fld_dtype = dtype_cstring;

			lex.g_field->fld_character_length = (USHORT) $3; }

			lex.g_field->fld_character_length = (USHORT)(size_t) $3; }

arg_desc_list1	:

arg_desc_list1	:

Lines 1158-1164	Link Here

logfile_attr	: KW_SIZE equals long_integer

logfile_attr	: KW_SIZE equals long_integer

			{ lex.g_file->fil_length = (SLONG) $3; }

			{ lex.g_file->fil_length = (SLONG)(IPTR) $3; }

/*

/*

		| RAW_PARTITIONS equals pos_short_integer

		| RAW_PARTITIONS equals pos_short_integer

			{ lex.g_file->fil_partitions = (SSHORT) $3;

			{ lex.g_file->fil_partitions = (SSHORT) $3;

Lines 1178-1186	Link Here

file_clause	: STARTING file_clause_noise long_integer

file_clause	: STARTING file_clause_noise long_integer

			{ lex.g_file->fil_start = (SLONG) $3;}

			{ lex.g_file->fil_start = (SLONG)(IPTR) $3;}

		| LENGTH equals long_integer page_noise

		| LENGTH equals long_integer page_noise

			{ lex.g_file->fil_length = (SLONG) $3;}

			{ lex.g_file->fil_length = (SLONG)(IPTR) $3;}

file_clause_noise :

file_clause_noise :

Lines 2186-2192	Link Here

array_range	: signed_long_integer

array_range	: signed_long_integer

	    		{ if ((SLONG) $1 < 1)

	    		{ if ((SLONG)(IPTR) $1 < 1)

		     		$$ = make_node (nod_list, (int) 2,

		     		$$ = make_node (nod_list, (int) 2,

					MAKE_constant ((STR) $1, CONSTANT_SLONG),

					MAKE_constant ((STR) $1, CONSTANT_SLONG),

					MAKE_constant ((STR) 1, CONSTANT_SLONG));

					MAKE_constant ((STR) 1, CONSTANT_SLONG));

Lines 2292-2317	Link Here

		| BLOB '(' unsigned_short_integer ')'

		| BLOB '(' unsigned_short_integer ')'

			lex.g_field->fld_dtype = dtype_blob;

			lex.g_field->fld_dtype = dtype_blob;

			lex.g_field->fld_seg_length = (USHORT) $3;

			lex.g_field->fld_seg_length = (USHORT)(size_t) $3;

			lex.g_field->fld_sub_type = 0;

			lex.g_field->fld_sub_type = 0;

		| BLOB '(' unsigned_short_integer ',' signed_short_integer ')'

		| BLOB '(' unsigned_short_integer ',' signed_short_integer ')'

			lex.g_field->fld_dtype = dtype_blob;

			lex.g_field->fld_dtype = dtype_blob;

			lex.g_field->fld_seg_length = (USHORT) $3;

			lex.g_field->fld_seg_length = (USHORT)(size_t) $3;

			lex.g_field->fld_sub_type = (USHORT) $5;

			lex.g_field->fld_sub_type = (USHORT)(size_t) $5;

		| BLOB '(' ',' signed_short_integer ')'

		| BLOB '(' ',' signed_short_integer ')'

			lex.g_field->fld_dtype = dtype_blob;

			lex.g_field->fld_dtype = dtype_blob;

			lex.g_field->fld_seg_length = 80;

			lex.g_field->fld_seg_length = 80;

			lex.g_field->fld_sub_type = (USHORT) $4;

			lex.g_field->fld_sub_type = (USHORT)(size_t) $4;

blob_segsize	: SEGMENT KW_SIZE unsigned_short_integer

blob_segsize	: SEGMENT KW_SIZE unsigned_short_integer

			lex.g_field->fld_seg_length = (USHORT) $3;

			lex.g_field->fld_seg_length = (USHORT)(size_t) $3;

Lines 2321-2327	Link Here

blob_subtype	: SUB_TYPE signed_short_integer

blob_subtype	: SUB_TYPE signed_short_integer

			lex.g_field->fld_sub_type = (USHORT) $2;

			lex.g_field->fld_sub_type = (USHORT)(size_t) $2;

		| SUB_TYPE symbol_blob_subtype_name

		| SUB_TYPE symbol_blob_subtype_name

Lines 2347-2353	Link Here

national_character_type	: national_character_keyword '(' pos_short_integer ')'

national_character_type	: national_character_keyword '(' pos_short_integer ')'

			lex.g_field->fld_dtype = dtype_text;

			lex.g_field->fld_dtype = dtype_text;

			lex.g_field->fld_character_length = (USHORT) $3;

			lex.g_field->fld_character_length = (USHORT)(size_t) $3;

			lex.g_field->fld_flags |= FLD_national;

			lex.g_field->fld_flags |= FLD_national;

		| national_character_keyword

		| national_character_keyword

Lines 2359-2365	Link Here

		| national_character_keyword VARYING '(' pos_short_integer ')'

		| national_character_keyword VARYING '(' pos_short_integer ')'

			lex.g_field->fld_dtype = dtype_varying;

			lex.g_field->fld_dtype = dtype_varying;

			lex.g_field->fld_character_length = (USHORT) $4;

			lex.g_field->fld_character_length = (USHORT)(size_t) $4;

			lex.g_field->fld_flags |= FLD_national;

			lex.g_field->fld_flags |= FLD_national;

Lines 2367-2373	Link Here

character_type	: character_keyword '(' pos_short_integer ')'

character_type	: character_keyword '(' pos_short_integer ')'

			lex.g_field->fld_dtype = dtype_text;

			lex.g_field->fld_dtype = dtype_text;

			lex.g_field->fld_character_length = (USHORT) $3;

			lex.g_field->fld_character_length = (USHORT)(size_t) $3;

		| character_keyword

		| character_keyword

Lines 2377-2383	Link Here

		| varying_keyword '(' pos_short_integer ')'

		| varying_keyword '(' pos_short_integer ')'

			lex.g_field->fld_dtype = dtype_varying;

			lex.g_field->fld_dtype = dtype_varying;

			lex.g_field->fld_character_length = (USHORT) $3;

			lex.g_field->fld_character_length = (USHORT)(size_t) $3;

Lines 2429-2438	Link Here

		| '(' signed_long_integer ')'

		| '(' signed_long_integer ')'

			if ( ((SLONG) $2 < 1) || ((SLONG) $2 > 18) )

			if ( ((SLONG)(IPTR) $2 < 1) || ((SLONG)(IPTR) $2 > 18) )

			    yyabandon (-842, isc_precision_err);

			    yyabandon (-842, isc_precision_err);

				/* Precision most be between 1 and 18. */

				/* Precision most be between 1 and 18. */

			if ((SLONG) $2 > 9)

			if ((SLONG)(IPTR) $2 > 9)

			    if ( ( (client_dialect <= SQL_DIALECT_V5) &&

			    if ( ( (client_dialect <= SQL_DIALECT_V5) &&

				   (db_dialect     >  SQL_DIALECT_V5) ) ||

				   (db_dialect     >  SQL_DIALECT_V5) ) ||

Lines 2469-2475	Link Here

			else

			else

			    if ((SLONG) $2 < 5)

			    if ((SLONG)(IPTR) $2 < 5)

			    	lex.g_field->fld_dtype = dtype_short;

			    	lex.g_field->fld_dtype = dtype_short;

			    	lex.g_field->fld_length = sizeof (SSHORT);

			    	lex.g_field->fld_length = sizeof (SSHORT);

Lines 2479-2495	Link Here

			    	lex.g_field->fld_dtype = dtype_long;

			    	lex.g_field->fld_dtype = dtype_long;

			    	lex.g_field->fld_length = sizeof (SLONG);

			    	lex.g_field->fld_length = sizeof (SLONG);

			lex.g_field->fld_precision = (USHORT) $2;

			lex.g_field->fld_precision = (USHORT)(size_t) $2;

		| '(' signed_long_integer ',' signed_long_integer ')'

		| '(' signed_long_integer ',' signed_long_integer ')'

			if ( ((SLONG) $2 < 1) || ((SLONG) $2 > 18) )

			if ( ((SLONG)(IPTR) $2 < 1) || ((SLONG)(IPTR) $2 > 18) )

			    yyabandon (-842, isc_precision_err);

			    yyabandon (-842, isc_precision_err);

				/* Precision should be between 1 and 18 */

				/* Precision should be between 1 and 18 */

			if (((SLONG) $4 > (SLONG) $2) || ((SLONG) $4 < 0))

			if (((SLONG)(IPTR) $4 > (SLONG)(IPTR) $2) || ((SLONG)(IPTR) $4 < 0))

			    yyabandon (-842, isc_scale_nogt);

			    yyabandon (-842, isc_scale_nogt);

				/* Scale must be between 0 and precision */

				/* Scale must be between 0 and precision */

			if ((SLONG) $2 > 9)

			if ((SLONG)(IPTR) $2 > 9)

			    if ( ( (client_dialect <= SQL_DIALECT_V5) &&

			    if ( ( (client_dialect <= SQL_DIALECT_V5) &&

				   (db_dialect     >  SQL_DIALECT_V5) ) ||

				   (db_dialect     >  SQL_DIALECT_V5) ) ||

Lines 2527-2533	Link Here

			else

			else

			    if ((SLONG) $2 < 5)

			    if ((SLONG)(IPTR) $2 < 5)

			    	lex.g_field->fld_dtype = dtype_short;

			    	lex.g_field->fld_dtype = dtype_short;

			    	lex.g_field->fld_length = sizeof (SSHORT);

			    	lex.g_field->fld_length = sizeof (SSHORT);

Lines 2538-2545	Link Here

			    	lex.g_field->fld_length = sizeof (SLONG);

			    	lex.g_field->fld_length = sizeof (SLONG);

			lex.g_field->fld_precision = (USHORT) $2;

			lex.g_field->fld_precision = (USHORT)(size_t) $2;

			lex.g_field->fld_scale = - (SSHORT) $4;

			lex.g_field->fld_scale = - (SSHORT)(size_t) $4;

Lines 2553-2559	Link Here

float_type	: KW_FLOAT precision_opt

float_type	: KW_FLOAT precision_opt

			if ((SLONG) $2 > 7)

			if ((SLONG)(IPTR) $2 > 7)

			    lex.g_field->fld_dtype = dtype_double;

			    lex.g_field->fld_dtype = dtype_double;

			    lex.g_field->fld_length = sizeof (double);

			    lex.g_field->fld_length = sizeof (double);

Lines 2756-2762	Link Here

table_lock	: FOR lock_type lock_mode

table_lock	: FOR lock_type lock_mode

			{ $$ = make_flag_node (nod_lock_mode, (SSHORT) ((SSHORT) $2 | (SSHORT) $3), (SSHORT) 0, NULL); }

			{ $$ = make_flag_node (nod_lock_mode, (SSHORT) ((SSHORT)(size_t) $2 | (SSHORT)(size_t) $3), (SSHORT) 0, NULL); }

			{ $$ = 0; }

			{ $$ = 0; }

Lines 3706-3737	Link Here

signed_short_integer	:	nonneg_short_integer

signed_short_integer	:	nonneg_short_integer

		| '-' neg_short_integer

		| '-' neg_short_integer

			{ $$ = (DSQL_NOD) - (SLONG) $2; }

			{ $$ = (DSQL_NOD) - (SLONG)(IPTR) $2; }

nonneg_short_integer	: NUMBER

nonneg_short_integer	: NUMBER

			{ if ((SLONG) $1 > SHRT_POS_MAX)

			{ if ((SLONG)(IPTR) $1 > SHRT_POS_MAX)

			    yyabandon (-842, isc_expec_short);

			    yyabandon (-842, isc_expec_short);

				/* Short integer expected */

				/* Short integer expected */

			  $$ = $1;}

			  $$ = $1;}

neg_short_integer : NUMBER

neg_short_integer : NUMBER

			{ if ((SLONG) $1 > SHRT_NEG_MAX)

			{ if ((SLONG)(IPTR) $1 > SHRT_NEG_MAX)

			    yyabandon (-842, isc_expec_short);

			    yyabandon (-842, isc_expec_short);

				/* Short integer expected */

				/* Short integer expected */

			  $$ = $1;}

			  $$ = $1;}

pos_short_integer : nonneg_short_integer

pos_short_integer : nonneg_short_integer

			{ if ((SLONG) $1 == 0)

			{ if ((SLONG)(IPTR) $1 == 0)

			    yyabandon (-842, isc_expec_positive);

			    yyabandon (-842, isc_expec_positive);

				/* Positive number expected */

				/* Positive number expected */

			  $$ = $1;}

			  $$ = $1;}

unsigned_short_integer : NUMBER

unsigned_short_integer : NUMBER

			{ if ((SLONG) $1 > SHRT_UNSIGNED_MAX)

			{ if ((SLONG)(IPTR) $1 > SHRT_UNSIGNED_MAX)

			    yyabandon (-842, isc_expec_ushort);

			    yyabandon (-842, isc_expec_ushort);

				/* Unsigned short integer expected */

				/* Unsigned short integer expected */

			  $$ = $1;}

			  $$ = $1;}

Lines 3739-3745	Link Here

signed_long_integer	:	long_integer

signed_long_integer	:	long_integer

		| '-' long_integer

		| '-' long_integer

			{ $$ = (DSQL_NOD) - (SLONG) $2; }

			{ $$ = (DSQL_NOD) - (SLONG)(IPTR) $2; }

long_integer	: NUMBER

long_integer	: NUMBER

Lines 3820-3833	Link Here

string_value_function	:  SUBSTRING '(' value FROM pos_short_integer ')'

string_value_function	:  SUBSTRING '(' value FROM pos_short_integer ')'

				{ $$ = make_node (nod_substr, e_substr_count, $3,

				{ $$ = make_node (nod_substr, e_substr_count, $3,

					MAKE_constant ((STR) ((SLONG)($5) - 1), CONSTANT_SLONG),

					MAKE_constant ((STR) ((SLONG)(IPTR)($5) - 1), CONSTANT_SLONG),

					MAKE_constant ((STR) SHRT_POS_MAX, CONSTANT_SLONG)); }

					MAKE_constant ((STR) SHRT_POS_MAX, CONSTANT_SLONG)); }

			/* CVC: It was easier to provide a constant with maximum value if the

			/* CVC: It was easier to provide a constant with maximum value if the

			third parameter -length- is ommitted than to chase and fix the functions

			third parameter -length- is ommitted than to chase and fix the functions

			that treat nod_substr as an aggregate and do not expect NULL arguments. */

			that treat nod_substr as an aggregate and do not expect NULL arguments. */

			| SUBSTRING '(' value FROM pos_short_integer FOR nonneg_short_integer ')'

			| SUBSTRING '(' value FROM pos_short_integer FOR nonneg_short_integer ')'

				{ $$ = make_node (nod_substr, e_substr_count, $3,

				{ $$ = make_node (nod_substr, e_substr_count, $3,

					MAKE_constant ((STR) ((SLONG)($5) - 1), CONSTANT_SLONG),

					MAKE_constant ((STR) ((SLONG)(IPTR)($5) - 1), CONSTANT_SLONG),

					MAKE_constant ((STR) ($7), CONSTANT_SLONG)); }

					MAKE_constant ((STR) ($7), CONSTANT_SLONG)); }

			| KW_UPPER '(' value ')'

			| KW_UPPER '(' value ')'

				{ $$ = make_node (nod_upcase, 1, $3); }

				{ $$ = make_node (nod_upcase, 1, $3); }

Lines 4960-4966	Link Here

    CHECK_BOUND(p);

    CHECK_BOUND(p);

    *p = 0;

    *p = 0;

    sym = HSHD_lookup (NULL_PTR, (TEXT *) string, (SSHORT)(p - string), SYM_keyword, parser_version);

    sym = HSHD_lookup (NULL_PTR, (TEXT *) string, (SSHORT)(size_t)(p - string), SYM_keyword, parser_version);

    if (sym)

    if (sym)

	/* 13 June 2003. Nickolay Samofatov

	/* 13 June 2003. Nickolay Samofatov

(-) firebird-1.5.3.4870.old/src/dsql/pass1.cpp (-5 / +5 lines)

Lines 642-648	Link Here

									  TRUE, TRUE,

									  TRUE, TRUE,

									  /* Pass 0 here to restore older parameter

									  /* Pass 0 here to restore older parameter

										ordering behavior */

										ordering behavior */

									  (USHORT)(ULONG) input->nod_arg[0]);

									  (USHORT)(ULONG)(IPTR) input->nod_arg[0]);

		return node;

		return node;

	case nod_udf:

	case nod_udf:

Lines 1561-1567	Link Here

				else {

				else {

					// we have Count(*)

					// we have Count(*)

					if (request->req_scope_level == (ULONG) node->nod_arg[1]) {

					if (request->req_scope_level == (ULONG)(IPTR) node->nod_arg[1]) {

						aggregate = TRUE;

						aggregate = TRUE;

Lines 4426-4432	Link Here

					(slist_node->nod_type == nod_list))

					(slist_node->nod_type == nod_list))

					/* an select list is there */

					/* an select list is there */

					position = (ULONG) sub->nod_arg[0];

					position = (ULONG)(IPTR) sub->nod_arg[0];

					if ((position < 1) || (position > (ULONG) slist_node->nod_count))

					if ((position < 1) || (position > (ULONG) slist_node->nod_count))

						ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

						ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

Lines 4819-4825	Link Here

		if (node1->nod_type == nod_constant && node1->nod_desc.dsc_dtype == dtype_long) {

		if (node1->nod_type == nod_constant && node1->nod_desc.dsc_dtype == dtype_long) {

			position = (ULONG) (node1->nod_arg[0]);

			position = (ULONG)(IPTR) (node1->nod_arg[0]);

			if ((position < 1) || !s_list ||

			if ((position < 1) || !s_list ||

				(position > (ULONG) s_list->nod_count)) {

				(position > (ULONG) s_list->nod_count)) {

				ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

				ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

Lines 5082-5088	Link Here

				ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

				ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

						  gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err,	/* invalid ORDER BY clause */

						  gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err,	/* invalid ORDER BY clause */

0);

0);

			number = (SLONG) position->nod_arg[0];

			number = (SLONG)(IPTR) position->nod_arg[0];

			if (number < 1 || number > union_items->nod_count)

			if (number < 1 || number > union_items->nod_count)

				ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

				ERRD_post(gds_sqlerr, gds_arg_number, (SLONG) - 104,

						  gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err,	/* invalid ORDER BY clause */

						  gds_arg_gds, gds_dsql_command_err, gds_arg_gds, gds_order_by_err,	/* invalid ORDER BY clause */

(-) firebird-1.5.3.4870.old/src/dudley/generate.cpp (-1 / +1 lines)

Lines 426-432	Link Here

	case nod_abort:

	case nod_abort:

		CHECK_BLR(2);

		CHECK_BLR(2);

		STUFF(blr_leave);

		STUFF(blr_leave);

		STUFF((int) node->nod_arg[0]);

		STUFF((int) (IPTR) node->nod_arg[0]);

		return;

		return;

	case nod_erase:

	case nod_erase:

(-) firebird-1.5.3.4870.old/src/dudley/trn.cpp (-1 / +1 lines)

Lines 244-250	Link Here

				break;

				break;

			case act_d_shadow:

			case act_d_shadow:

				drop_shadow(dyn, (SLONG) (action->act_object));

				drop_shadow(dyn, (SLONG)(IPTR) (action->act_object));

				break;

				break;

			case act_m_trigger_msg:

			case act_m_trigger_msg:

(-) firebird-1.5.3.4870.old/src/jrd/jrd.cpp (-2 / +2 lines)

Lines 3877-3885	Link Here

		if ( (node = csb->csb_rpt[i].csb_message) )

		if ( (node = csb->csb_rpt[i].csb_message) )

			if ((int) node->nod_arg[e_msg_number] == 0) {

			if ((int) (IPTR) node->nod_arg[e_msg_number] == 0) {

				in_message = node;

				in_message = node;

			} else if ((int) node->nod_arg[e_msg_number] == 1) {

			} else if ((int) (IPTR) node->nod_arg[e_msg_number] == 1) {

				out_message = node;

				out_message = node;

(-) firebird-1.5.3.4870.old/src/jrd/jrn.cpp (-9 / +9 lines)

Lines 836-842	Link Here

	for (loop = 0; loop < 20; loop++) {

	for (loop = 0; loop < 20; loop++) {

		for (;;) {

		for (;;) {

			journal->jrn_channel = (int *) socket(AF_INET, SOCK_STREAM, 0);

			journal->jrn_channel = (int *) socket(AF_INET, SOCK_STREAM, 0);

			if ((int) journal->jrn_channel != -1)

			if ((int) (IPTR) journal->jrn_channel != -1)

				break;

				break;

			if (!SYSCALL_INTERRUPTED(errno)) {

			if (!SYSCALL_INTERRUPTED(errno)) {

				error(status_vector, journal, errno, "socket");

				error(status_vector, journal, errno, "socket");

Lines 859-876	Link Here

			return ret_val;

			return ret_val;

		if (!connect((int) journal->jrn_channel, (sockaddr*)&address, sizeof(address)))

		if (!connect((int) (IPTR) journal->jrn_channel, (sockaddr*)&address, sizeof(address)))

			break;

			break;

		sleep(3);

		sleep(3);

		if (loop < 16) {

		if (loop < 16) {

			close((int) journal->jrn_channel);

			close((int) (IPTR) journal->jrn_channel);

			continue;

			continue;

		if (!SYSCALL_INTERRUPTED(errno)) {

		if (!SYSCALL_INTERRUPTED(errno)) {

			if (retry) {

			if (retry) {

				close((int) journal->jrn_channel);

				close((int) (IPTR) journal->jrn_channel);

				gds__free(journal);

				gds__free(journal);

				*ret_jrn = (JRN) NULL;

				*ret_jrn = (JRN) NULL;

				return FB_SUCCESS;

				return FB_SUCCESS;

Lines 879-885	Link Here

			gds__free(journal);

			gds__free(journal);

			return FB_FAILURE;

			return FB_FAILURE;

		close((int) journal->jrn_channel);

		close((int) (IPTR) journal->jrn_channel);

#endif

#endif

Lines 939-945	Link Here

		if (retry)

		if (retry)

#ifdef BSD_SOCKETS

#ifdef BSD_SOCKETS

			close((int) journal->jrn_channel);

			close((int) (IPTR) journal->jrn_channel);

#endif

#endif

#ifdef WIN_NT

#ifdef WIN_NT

Lines 1056-1062	Link Here

    with us, so keep trying until successful.  */

    with us, so keep trying until successful.  */

	do {

	do {

		l = recv((int) journal->jrn_channel, (char *) reply, sizeof(struct jrnr), 0);

		l = recv((int) (IPTR) journal->jrn_channel, (char *) reply, sizeof(struct jrnr), 0);

	} while (l < 0 && SYSCALL_INTERRUPTED(errno));

	} while (l < 0 && SYSCALL_INTERRUPTED(errno));

	if (l < 0) {

	if (l < 0) {

Lines 1095-1101	Link Here

 **************************************/

 **************************************/

#ifdef BSD_SOCKETS

#ifdef BSD_SOCKETS

	if (close((int) journal->jrn_channel) < 0) {

	if (close((int) (IPTR) journal->jrn_channel) < 0) {

		error(status_vector, journal, errno, "close");

		error(status_vector, journal, errno, "close");

		return FB_FAILURE;

		return FB_FAILURE;

Lines 1166-1172	Link Here

    with us, so keep trying until successful.  */

    with us, so keep trying until successful.  */

	do {

	do {

		l = send((int) journal->jrn_channel, (char *) buffer, (int) length, 0);

		l = send((int) (IPTR) journal->jrn_channel, (char *) buffer, (int) length, 0);

	} while (l < 0 && SYSCALL_INTERRUPTED(errno));

	} while (l < 0 && SYSCALL_INTERRUPTED(errno));

	if (l < 0) {

	if (l < 0) {

(-) firebird-1.5.3.4870.old/src/jrd/lck.cpp (-2 / +2 lines)

Lines 87-94	Link Here

#ifdef SUPERSERVER

#ifdef SUPERSERVER

#define LCK_OWNER_ID_PROCESS		(SLONG) getpid()

#define LCK_OWNER_ID_PROCESS		(SLONG) getpid()

#define LCK_OWNER_ID_DBB		(SLONG) dbb

#define LCK_OWNER_ID_DBB		(SLONG)(IPTR) dbb

#define LCK_OWNER_ID_ATT		(SLONG) attachment

#define LCK_OWNER_ID_ATT		(SLONG)(IPTR) attachment

#define LCK_OWNER_TYPE_PROCESS		LCK_OWNER_process

#define LCK_OWNER_TYPE_PROCESS		LCK_OWNER_process

#define LCK_OWNER_TYPE_DBB		LCK_OWNER_dbb

#define LCK_OWNER_TYPE_DBB		LCK_OWNER_dbb

(-) firebird-1.5.3.4870.old/src/jrd/nav.cpp (-10 / +10 lines)

Lines 487-493	Link Here

	init_fetch(impure);

	init_fetch(impure);

	idx =

	idx =

		(IDX *) ((SCHAR *) impure + (SLONG) rsb->rsb_arg[RSB_NAV_idx_offset]);

		(IDX *) ((SCHAR *) impure + (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]);

/* The bitmap is only valid when we are continuing on in one

/* The bitmap is only valid when we are continuing on in one

   direction.  It is of no help when we change direction,

   direction.  It is of no help when we change direction,

Lines 521-532	Link Here

#ifdef SCROLLABLE_CURSORS

#ifdef SCROLLABLE_CURSORS

		MOVE_FAST(

		MOVE_FAST(

				  (impure->irsb_nav_data +

				  (impure->irsb_nav_data +

				   (2 * (SLONG) rsb->rsb_arg[RSB_NAV_key_length])),

				   (2 * (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_key_length])),

				  upper.key_data, upper.key_length);

				  upper.key_data, upper.key_length);

#else

#else

		MOVE_FAST(

		MOVE_FAST(

				  (impure->irsb_nav_data +

				  (impure->irsb_nav_data +

				   (SLONG) rsb->rsb_arg[RSB_NAV_key_length]), upper.key_data,

				   (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_key_length]), upper.key_data,

				  upper.key_length);

				  upper.key_length);

#endif

#endif

Lines 534-540	Link Here

		lower.key_length = impure->irsb_nav_lower_length;

		lower.key_length = impure->irsb_nav_lower_length;

		MOVE_FAST(

		MOVE_FAST(

				  (impure->irsb_nav_data +

				  (impure->irsb_nav_data +

				   (SLONG) rsb->rsb_arg[RSB_NAV_key_length]), lower.key_data,

				   (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_key_length]), lower.key_data,

				  lower.key_length);

				  lower.key_length);

Lines 1404-1410	Link Here

	tdbb = GET_THREAD_DATA;

	tdbb = GET_THREAD_DATA;

	idx =

	idx =

		(IDX *) ((SCHAR *) impure + (SLONG) rsb->rsb_arg[RSB_NAV_idx_offset]);

		(IDX *) ((SCHAR *) impure + (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]);

	page = (BTR) CCH_FETCH(tdbb, window, LCK_read, pag_index);

	page = (BTR) CCH_FETCH(tdbb, window, LCK_read, pag_index);

/* the outer loop goes through all the sibling pages

/* the outer loop goes through all the sibling pages

Lines 1619-1625	Link Here

	tdbb = GET_THREAD_DATA;

	tdbb = GET_THREAD_DATA;

	request = tdbb->tdbb_request;

	request = tdbb->tdbb_request;

	idx =

	idx =

		(IDX *) ((SCHAR *) impure + (SLONG) rsb->rsb_arg[RSB_NAV_idx_offset]);

		(IDX *) ((SCHAR *) impure + (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]);

	BOOLEAN result;

	BOOLEAN result;

Lines 1656-1662	Link Here

				rpb->rpb_record,

				rpb->rpb_record,

				reinterpret_cast <

				reinterpret_cast <

				struct idx *>((SCHAR *) impure +

				struct idx *>((SCHAR *) impure +

							  (SLONG) rsb->rsb_arg[RSB_NAV_idx_offset]),

							  (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]),

				&value,

				&value,

0);

0);

		if (compare_keys(idx, key->key_data, key->key_length, &value, FALSE)) {

		if (compare_keys(idx, key->key_data, key->key_length, &value, FALSE)) {

Lines 1757-1763	Link Here

	retrieval_node = (JRD_NOD) rsb->rsb_arg[RSB_NAV_index];

	retrieval_node = (JRD_NOD) rsb->rsb_arg[RSB_NAV_index];

	retrieval = (IRB) retrieval_node->nod_arg[e_idx_retrieval];

	retrieval = (IRB) retrieval_node->nod_arg[e_idx_retrieval];

	idx =

	idx =

		(IDX *) ((SCHAR *) impure + (SLONG) rsb->rsb_arg[RSB_NAV_idx_offset]);

		(IDX *) ((SCHAR *) impure + (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]);

	page =

	page =

		BTR_find_page(tdbb, retrieval, window, idx, &lower, &upper,

		BTR_find_page(tdbb, retrieval, window, idx, &lower, &upper,

					  (direction == RSE_get_backward));

					  (direction == RSE_get_backward));

Lines 1802-1808	Link Here

			impure->irsb_nav_upper_length = upper.key_length;

			impure->irsb_nav_upper_length = upper.key_length;

			MOVE_FAST(upper.key_data,

			MOVE_FAST(upper.key_data,

					  (impure->irsb_nav_data +

					  (impure->irsb_nav_data +

					   (SLONG) rsb->rsb_arg[RSB_NAV_key_length]),

					   (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_key_length]),

					  upper.key_length);

					  upper.key_length);

		if (retrieval->irb_lower_count)

		if (retrieval->irb_lower_count)

Lines 1813-1819	Link Here

			impure->irsb_nav_lower_length = lower.key_length;

			impure->irsb_nav_lower_length = lower.key_length;

			MOVE_FAST(lower.key_data,

			MOVE_FAST(lower.key_data,

					  (impure->irsb_nav_data +

					  (impure->irsb_nav_data +

					   (SLONG) rsb->rsb_arg[RSB_NAV_key_length]),

					   (SLONG) (IPTR) rsb->rsb_arg[RSB_NAV_key_length]),

					  lower.key_length);

					  lower.key_length);

		if (retrieval->irb_upper_count)

		if (retrieval->irb_upper_count)

(-) firebird-1.5.3.4870.old/src/jrd/rse.cpp (-8 / +8 lines)

Lines 2151-2157	Link Here

	desc = msg_format->fmt_desc[msg_format->fmt_count - 1];

	desc = msg_format->fmt_desc[msg_format->fmt_count - 1];

	desc.dsc_address = (UCHAR *) (om + (int) desc.dsc_address);

	desc.dsc_address = (UCHAR *) (om + (int) (IPTR) desc.dsc_address);

	eos_desc.dsc_dtype = dtype_short;

	eos_desc.dsc_dtype = dtype_short;

	eos_desc.dsc_scale = 0;

	eos_desc.dsc_scale = 0;

	eos_desc.dsc_length = sizeof(SSHORT);

	eos_desc.dsc_length = sizeof(SSHORT);

Lines 2959-2965	Link Here

	for (item = map->smb_rpt; item < end_item; item++) {

	for (item = map->smb_rpt; item < end_item; item++) {

		flag = *(data + item->smb_flag_offset);

		flag = *(data + item->smb_flag_offset);

		from = item->smb_desc;

		from = item->smb_desc;

		from.dsc_address = data + (ULONG) from.dsc_address;

		from.dsc_address = data + (ULONG) (IPTR) from.dsc_address;

		if ((node = item->smb_node) && node->nod_type != nod_field)

		if ((node = item->smb_node) && node->nod_type != nod_field)

			continue;

			continue;

Lines 3211-3217	Link Here

		end_item = map->smb_rpt + map->smb_count;

		end_item = map->smb_rpt + map->smb_count;

		for (item = map->smb_rpt; item < end_item; item++) {

		for (item = map->smb_rpt; item < end_item; item++) {

			to = item->smb_desc;

			to = item->smb_desc;

			to.dsc_address = data + (ULONG) to.dsc_address;

			to.dsc_address = data + (ULONG) (IPTR) to.dsc_address;

			flag = FALSE;

			flag = FALSE;

			if (item->smb_node) {

			if (item->smb_node) {

				from = EVL_expr(tdbb, item->smb_node);

				from = EVL_expr(tdbb, item->smb_node);

Lines 3301-3312	Link Here

	desc2.dsc_flags = 0;

	desc2.dsc_flags = 0;

	desc2.dsc_address = (UCHAR *) & indicator;

	desc2.dsc_address = (UCHAR *) & indicator;

	desc1 = *flag_desc;

	desc1 = *flag_desc;

	desc1.dsc_address = msg + (int) flag_desc->dsc_address;

	desc1.dsc_address = msg + (int) (IPTR) flag_desc->dsc_address;

	MOV_move(&desc1, &desc2);

	MOV_move(&desc1, &desc2);

	if (indicator) {

	if (indicator) {

		SET_NULL(record, to_id);

		SET_NULL(record, to_id);

		l = to_desc->dsc_length;

		l = to_desc->dsc_length;

		p = record->rec_data + (int) to_desc->dsc_address;

		p = record->rec_data + (int) (IPTR) to_desc->dsc_address;

		switch (to_desc->dsc_dtype) {

		switch (to_desc->dsc_dtype) {

		case dtype_text:

		case dtype_text:

			/* YYY - not necessarily the right thing to do */

			/* YYY - not necessarily the right thing to do */

Lines 3336-3344	Link Here

	else {

	else {

		CLEAR_NULL(record, to_id);

		CLEAR_NULL(record, to_id);

		desc1 = *from_desc;

		desc1 = *from_desc;

		desc1.dsc_address = msg + (int) desc1.dsc_address;

		desc1.dsc_address = msg + (int) (IPTR) desc1.dsc_address;

		desc2 = *to_desc;

		desc2 = *to_desc;

		desc2.dsc_address = record->rec_data + (int) desc2.dsc_address;

		desc2.dsc_address = record->rec_data + (int) (IPTR) desc2.dsc_address;

		if (!DSC_EQUIV((&desc1), (&desc2)))

		if (!DSC_EQUIV((&desc1), (&desc2)))

			MOV_move(&desc1, &desc2);

			MOV_move(&desc1, &desc2);

Lines 3817-3823	Link Here

	if (!sfb_->sfb_file_name) {

	if (!sfb_->sfb_file_name) {

		TEXT file_name[128];

		TEXT file_name[128];

		sfb_->sfb_file = (int) gds__temp_file(FALSE, SCRATCH, file_name);

		sfb_->sfb_file = (int) (IPTR) gds__temp_file(FALSE, SCRATCH, file_name);

		if (sfb_->sfb_file == -1)

		if (sfb_->sfb_file == -1)

			SORT_error(tdbb->tdbb_status_vector, sfb_, "open", isc_io_error,

			SORT_error(tdbb->tdbb_status_vector, sfb_, "open", isc_io_error,

					   errno);

					   errno);

(-) firebird-1.5.3.4870.old/src/jrd/sort.cpp (-1 / +1 lines)

Lines 1788-1794	Link Here

			/* Create a scratch file */

			/* Create a scratch file */

			sfb->sfb_file =

			sfb->sfb_file =

				(int) gds__temp_file(FALSE, SCRATCH, file_name,

				(int) (IPTR) gds__temp_file(FALSE, SCRATCH, file_name,

									 sfb->sfb_dls->dls_directory, TRUE);

									 sfb->sfb_dls->dls_directory, TRUE);

			/* allocate the file name even if the file is not open,

			/* allocate the file name even if the file is not open,

(-) firebird-1.5.3.4870.old/src/qli/eval.cpp (-4 / +4 lines)

Lines 200-209	Link Here

	if (node->nod_type == nod_rpt_average && node->nod_arg[e_stt_default])

	if (node->nod_type == nod_rpt_average && node->nod_arg[e_stt_default])

		if (node->nod_desc.dsc_dtype == dtype_long)

		if (node->nod_desc.dsc_dtype == dtype_long)

			*(SLONG *) node->nod_desc.dsc_address /= (SLONG) node->

			*(SLONG *) node->nod_desc.dsc_address /= (SLONG) (IPTR) node->

				nod_arg[e_stt_default];

				nod_arg[e_stt_default];

		else

		else

			*(double *) node->nod_desc.dsc_address /= (SLONG) node->

			*(double *) node->nod_desc.dsc_address /= (SLONG) (IPTR) node->

				nod_arg[e_stt_default];

				nod_arg[e_stt_default];

Lines 241-247	Link Here

/* If this is the first value, just move it in. */

/* If this is the first value, just move it in. */

	count = (SLONG) node->nod_arg[e_stt_default] + 1;

	count = (SLONG) (IPTR) node->nod_arg[e_stt_default] + 1;

	if (count == 1) {

	if (count == 1) {

		if (desc2->dsc_missing)

		if (desc2->dsc_missing)

			desc1->dsc_missing = DSC_missing;

			desc1->dsc_missing = DSC_missing;

Lines 374-380	Link Here

	case nod_rpt_min:

	case nod_rpt_min:

	case nod_rpt_total:

	case nod_rpt_total:

	case nod_rpt_average:

	case nod_rpt_average:

		if (!(SLONG) node->nod_arg[e_stt_default])

		if (!(SLONG) (IPTR) node->nod_arg[e_stt_default])

			desc->dsc_missing = DSC_missing;

			desc->dsc_missing = DSC_missing;

	case nod_rpt_count:

	case nod_rpt_count:

(-) firebird-1.5.3.4870.old/src/qli/expand.cpp (-2 / +2 lines)

Lines 1830-1836	Link Here

	item->itm_count = (int) syn_item->syn_arg[0];

	item->itm_count = (int)(IPTR) syn_item->syn_arg[0];

	return item;

	return item;

Lines 2131-2137	Link Here

/* Handle implicit boolean from SQL xxx IN (yyy FROM relation) */

/* Handle implicit boolean from SQL xxx IN (yyy FROM relation) */

	if (input->syn_arg[s_rse_outer]) {

	if (input->syn_arg[s_rse_outer]) {

		eql_node = MAKE_NODE((enum nod_t)(int)input->syn_arg[s_rse_op], 2);

		eql_node = MAKE_NODE((enum nod_t)(int)(IPTR)input->syn_arg[s_rse_op], 2);

		eql_node->nod_arg[0] =

		eql_node->nod_arg[0] =

			expand_expression(input->syn_arg[s_rse_outer], old_stack);

			expand_expression(input->syn_arg[s_rse_outer], old_stack);

		eql_node->nod_arg[1] =

		eql_node->nod_arg[1] =

(-) firebird-1.5.3.4870.old/src/qli/gener.cpp (-2 / +2 lines)

Lines 1556-1562	Link Here

	rlb = CHECK_RLB(request->req_blr);

	rlb = CHECK_RLB(request->req_blr);

	if ((NOD_T) (int) node->nod_arg[e_rse_join_type] == (NOD_T) 0)

	if ((NOD_T) (int) (IPTR) node->nod_arg[e_rse_join_type] == (NOD_T) 0)

		STUFF(blr_rse);

		STUFF(blr_rse);

	else

	else

		STUFF(blr_rs_stream);

		STUFF(blr_rs_stream);

Lines 1625-1631	Link Here

	if (list = node->nod_arg[e_rse_reduced])

	if (list = node->nod_arg[e_rse_reduced])

		gen_sort(list, request, blr_project);

		gen_sort(list, request, blr_project);

	join_type = (NOD_T) (int) node->nod_arg[e_rse_join_type];

	join_type = (NOD_T) (int) (IPTR) node->nod_arg[e_rse_join_type];

	if (join_type != (NOD_T) 0 && join_type != nod_join_inner) {

	if (join_type != (NOD_T) 0 && join_type != nod_join_inner) {

		STUFF(blr_join_type);

		STUFF(blr_join_type);

		if (join_type == nod_join_left)

		if (join_type == nod_join_left)

(-) firebird-1.5.3.4870.old/src/qli/lex.cpp (-1 / +1 lines)

Lines 597-603	Link Here

	for (temp = QLI_line;

	for (temp = QLI_line;

		 temp->line_next && QLI_statements;

		 temp->line_next && QLI_statements;

		 temp = temp->line_next)

		 temp = temp->line_next)

if (temp->line_next->line_position == (SLONG) QLI_statements->lls_object) return;

if (temp->line_next->line_position == (SLONG) (IPTR) QLI_statements->lls_object) return;

	statement = (LLS) ALLOCP(type_lls);

	statement = (LLS) ALLOCP(type_lls);

	statement->lls_object = (BLK) temp->line_position;

	statement->lls_object = (BLK) temp->line_position;

(-) firebird-1.5.3.4870.old/src/qli/parse.cpp (-3 / +3 lines)

Lines 1524-1530	Link Here

			IBERROR(176);		/* Msg176 No statements issued yet */

			IBERROR(176);		/* Msg176 No statements issued yet */

		if (MATCH(KW_ASTERISK))

		if (MATCH(KW_ASTERISK))

			LEX_edit((SLONG) 0, (SLONG) statement_list->lls_object);

			LEX_edit((SLONG) 0, (SLONG) (IPTR) statement_list->lls_object);

		else {

		else {

			if (KEYWORD(KW_SEMI))

			if (KEYWORD(KW_SEMI))

				l = 1;

				l = 1;

Lines 1534-1540	Link Here

			for (start = stop = statement_list;

			for (start = stop = statement_list;

				 l && start->lls_next; l--, start = start->lls_next);

				 l && start->lls_next; l--, start = start->lls_next);

			command_end();

			command_end();

			LEX_edit((SLONG) start->lls_object, (SLONG) stop->lls_object);

			LEX_edit((SLONG) (IPTR) start->lls_object, (SLONG) (IPTR) stop->lls_object);

#ifdef PYXIS

#ifdef PYXIS

Lines 2925-2931	Link Here

			node->syn_arg[0] = INT_CAST 1;

			node->syn_arg[0] = INT_CAST 1;

			if (op == nod_column || QLI_token->tok_type == tok_number)

			if (op == nod_column || QLI_token->tok_type == tok_number)

				node->syn_arg[0] = INT_CAST parse_ordinal();

				node->syn_arg[0] = INT_CAST parse_ordinal();

			if ((op == nod_skip) && ((int) node->syn_arg[0] < 1))

			if ((op == nod_skip) && ((int) (IPTR) node->syn_arg[0] < 1))

				SYNTAX_ERROR(478);	/* Msg478 number > 0 */

				SYNTAX_ERROR(478);	/* Msg478 number > 0 */

		LLS_PUSH(node, &stack);

		LLS_PUSH(node, &stack);

(-) firebird-1.5.3.4870.old/src/qli/show.epp (-1 / +1 lines)

Lines 154-160	Link Here

	ptr = node->syn_arg;

	ptr = node->syn_arg;

	for (i = 0; i < node->syn_count; i++) {

	for (i = 0; i < node->syn_count; i++) {

		sw = (ENUM show_t) (int) * ptr++;

		sw = (ENUM show_t) (int)(IPTR) * ptr++;

		value = *ptr++;

		value = *ptr++;

		if (sw != show_matching_language &&

		if (sw != show_matching_language &&

			sw != show_version &&

			sw != show_version &&

(-) firebird-1.5.3.4870.old/src/remote/inet_server.cpp (-1 / +1 lines)

Lines 380-386	Link Here

		if (!debug) {

		if (!debug) {

			FD_ZERO(&mask);

			FD_ZERO(&mask);

			FD_SET(2, &mask);

			FD_SET(2, &mask);

			divorce_terminal((int) &mask);

			divorce_terminal((int) (IPTR) &mask);

			ISC_STATUS_ARRAY status_vector;

			ISC_STATUS_ARRAY status_vector;

(-) firebird-1.5.3.4870.old/src/remote/interface.cpp (-3 / +3 lines)

Lines 3231-3237	Link Here

 		// Nickolay Samofatov: We pass this value to the server (as 32-bit value)

 		// Nickolay Samofatov: We pass this value to the server (as 32-bit value)

 		// then it returns it to us and we do not use it. Maybe pass zero here

 		// then it returns it to us and we do not use it. Maybe pass zero here

 		// to avoid client-side security risks?

 		// to avoid client-side security risks?

		event->p_event_ast = (SLONG) ast;

		event->p_event_ast = (SLONG)(IPTR) ast;

		event->p_event_arg = (SLONG)(IPTR) arg;

		event->p_event_arg = (SLONG)(IPTR) arg;

		event->p_event_rid = rem_event->rvnt_id;

		event->p_event_rid = rem_event->rvnt_id;

Lines 6226-6233	Link Here

		for (; to_desc < end_desc; from_desc++, to_desc++) {

		for (; to_desc < end_desc; from_desc++, to_desc++) {

			from = *from_desc;

			from = *from_desc;

			to = *to_desc;

			to = *to_desc;

			from.dsc_address = from_msg + (SLONG) from.dsc_address;

			from.dsc_address = from_msg + (SLONG)(IPTR) from.dsc_address;

			to.dsc_address = to_msg + (SLONG) to.dsc_address;

			to.dsc_address = to_msg + (SLONG)(IPTR) to.dsc_address;

			CVT_move(&from, &to, (FPTR_VOID) move_error);

			CVT_move(&from, &to, (FPTR_VOID) move_error);

(-) firebird-1.5.3.4870.old/src/remote/protocol.cpp (-1 / +1 lines)

Lines 984-990	Link Here

	BLOB_PTR *p;

	BLOB_PTR *p;

	SSHORT n;

	SSHORT n;

	p = buffer + (ULONG) desc->dsc_address;

	p = buffer + (ULONG) (IPTR) desc->dsc_address;

	switch (desc->dsc_dtype) {

	switch (desc->dsc_dtype) {

	case dtype_text:

	case dtype_text:

(-) firebird-1.5.3.4870.old/src/remote/server.cpp (-1 / +1 lines)

Lines 4361-4367	Link Here

	// Nickolay Samofatov: We keep this values and even pass them to the client

	// Nickolay Samofatov: We keep this values and even pass them to the client

	// (as 32-bit values) when event is fired, but client ignores them.

	// (as 32-bit values) when event is fired, but client ignores them.

	p_event->p_event_ast = (SLONG) event->rvnt_ast;

	p_event->p_event_ast = (SLONG)(IPTR) event->rvnt_ast;

	p_event->p_event_arg = (SLONG)(IPTR) event->rvnt_arg;

	p_event->p_event_arg = (SLONG)(IPTR) event->rvnt_arg;

	p_event->p_event_rid = event->rvnt_rid;

	p_event->p_event_rid = event->rvnt_rid;

(-) firebird-1.5.3.4870.old/src/utilities/gsec.cpp (-1 / +1 lines)

Lines 96-102	Link Here

	int exit_code;

	int exit_code;

	exit_code = UTIL_gsec(service->svc_argc, service->svc_argv,

	exit_code = UTIL_gsec(service->svc_argc, service->svc_argv,

						  output_svc, (SLONG) service);

						  output_svc, (SLONG) (IPTR) service);

/* Mark service thread as finished. */

/* Mark service thread as finished. */

/* If service is detached, cleanup memory being used by service. */

/* If service is detached, cleanup memory being used by service. */

(-) firebird-1.5.3.4870.old/src/wal/walw.cpp (-1 / +1 lines)

Lines 199-205	Link Here

#ifdef SUPERSERVER

#ifdef SUPERSERVER

	int argc;

	int argc;

	argc = (int) argv[0];

	argc = (int) (IPTR) argv[0];

#endif

#endif

	dbname = "";

	dbname = "";

(-) firebird-1.5.3.4870.old/src/dudley/exe.epp (-1 / +1 lines)

Lines 626-632	Link Here

				break;

				break;

			case act_d_shadow:

			case act_d_shadow:

				drop_shadow((SLONG) action->act_object);

				drop_shadow((SLONG) (IPTR) action->act_object);

				break;

				break;

			case act_a_generator:

			case act_a_generator:

Attachment #93546: patch to fix compilation problems with gcc-4.1 on amd64 for bug #120867