SOURCES: Firebird-gcc4.patch - more

arekm arekm at pld-linux.org
Sun Aug 20 15:24:54 CEST 2006


Author: arekm                        Date: Sun Aug 20 13:24:54 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- more

---- Files affected:
SOURCES:
   Firebird-gcc4.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/Firebird-gcc4.patch
diff -u SOURCES/Firebird-gcc4.patch:1.4 SOURCES/Firebird-gcc4.patch:1.5
--- SOURCES/Firebird-gcc4.patch:1.4	Tue Mar 28 20:24:52 2006
+++ SOURCES/Firebird-gcc4.patch	Sun Aug 20 15:24:49 2006
@@ -1,13 +1,68 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## gcc4.dpatch by  <Damyan Ivanov <divanov at creditreform.bg>>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make sources compile with gcc4
-
- at DPATCH@
-diff -urNad firebird2-1.5.3.4870~/src/common/classes/alloc.h firebird2-1.5.3.4870/src/common/classes/alloc.h
---- firebird2-1.5.3.4870~/src/common/classes/alloc.h	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/common/classes/alloc.h	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/burp/burp.cpp firebird-1.5.3.4870/src/burp/burp.cpp
+--- firebird-1.5.3.4870-orig/src/burp/burp.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/burp/burp.cpp	2006-03-17 01:32:16.000000000 -0500
+@@ -1606,7 +1606,7 @@
+ #ifndef WIN_NT
+ 				signal(SIGPIPE, SIG_IGN);
+ #endif
+-				fil->fil_fd = reinterpret_cast<DESC>(GBAK_STDOUT_DESC);
++				fil->fil_fd = GBAK_STDOUT_DESC();
+ 				break;
+ 			}
+ 			else
+@@ -1724,7 +1724,7 @@
+ 
+ 	tdgbl->action->act_action = ACT_restore;
+ 	if (!strcmp(fil->fil_name, "stdin")) {
+-		fil->fil_fd = reinterpret_cast<DESC>(GBAK_STDIN_DESC);
++		fil->fil_fd = GBAK_STDIN_DESC();
+ 		tdgbl->file_desc = fil->fil_fd;
+ 		tdgbl->gbl_sw_files = fil->fil_next;
+ 	}
+diff -ur firebird-1.5.3.4870-orig/src/burp/std_desc.h firebird-1.5.3.4870/src/burp/std_desc.h
+--- firebird-1.5.3.4870-orig/src/burp/std_desc.h	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/burp/std_desc.h	2006-03-17 01:41:38.000000000 -0500
+@@ -35,12 +35,33 @@
+ #include "firebird.h"
+ 
+ #ifdef WIN_NT
++
+ #include <windows.h>
+-#define	GBAK_STDIN_DESC			GetStdHandle(STD_INPUT_HANDLE)	/* standart input  file descriptor */
+-#define	GBAK_STDOUT_DESC		GetStdHandle(STD_OUTPUT_HANDLE)	/* standart output file descriptor */
++
++typedef HANDLE DESC;
++
++static inline DESC GBAK_STDIN_DESC(void)
++{
++	return GetStdHandle(STD_INPUT_HANDLE); // standard input file descriptor 
++}
++static inline DESC GBAK_STDOUT_DESC(void)
++{
++	return GetStdHandle(STD_OUTPUT_HANDLE);	// standard output file descriptor
++}
++
+ #else //WIN_NT
+-#define	GBAK_STDIN_DESC			(int)0	/* standart input  file descriptor */
+-#define	GBAK_STDOUT_DESC		(int)1	/* standart output file descriptor */
++
++typedef int DESC;
++
++static inline DESC GBAK_STDIN_DESC(void)
++{
++	return 0;	// standard input file descriptor 
++}
++static inline DESC GBAK_STDOUT_DESC(void)
++{
++	return 1;	// standard output file descriptor
++}
++
+ #endif //WIN_NT
+ 
+ #endif  //GBAK_STD_DESC_H
+diff -ur firebird-1.5.3.4870-orig/src/common/classes/alloc.h firebird-1.5.3.4870/src/common/classes/alloc.h
+--- firebird-1.5.3.4870-orig/src/common/classes/alloc.h	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/common/classes/alloc.h	2006-03-17 01:32:16.000000000 -0500
 @@ -241,23 +241,29 @@
  
  void operator delete[](void* mem) throw();
@@ -42,9 +97,9 @@
  	return pool.allocate(s);
  //	return pool.calloc(s);
  }
-diff -urNad firebird2-1.5.3.4870~/src/common/config/config.cpp firebird2-1.5.3.4870/src/common/config/config.cpp
---- firebird2-1.5.3.4870~/src/common/config/config.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/common/config/config.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/common/config/config.cpp firebird-1.5.3.4870/src/common/config/config.cpp
+--- firebird-1.5.3.4870-orig/src/common/config/config.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/common/config/config.cpp	2006-03-17 01:32:16.000000000 -0500
 @@ -261,12 +261,12 @@
  
  int Config::getSortMemBlockSize()
@@ -228,9 +283,127 @@
  #else
  	return 0;
  #endif
-diff -urNad firebird2-1.5.3.4870~/src/gpre/c_cxx.cpp firebird2-1.5.3.4870/src/gpre/c_cxx.cpp
---- firebird2-1.5.3.4870~/src/gpre/c_cxx.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/gpre/c_cxx.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/dsql/parse.cpp firebird-1.5.3.4870/src/dsql/parse.cpp
+--- firebird-1.5.3.4870-orig/src/dsql/parse.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/dsql/parse.cpp	2006-03-17 01:32:17.000000000 -0500
+@@ -6421,7 +6421,7 @@
+ case 79:
+ { 
+ 			lex.g_field->fld_dtype = dtype_cstring; 
+-			lex.g_field->fld_character_length = (USHORT) yyvsp[-2]; }
++			lex.g_field->fld_character_length = (USHORT)(IPTR) yyvsp[-2]; }
+ break;
+ case 80:
+ { yyval = (DSQL_NOD) NULL; }
+@@ -7541,27 +7541,27 @@
+ case 507:
+ { 
+ 			lex.g_field->fld_dtype = dtype_blob; 
+-			lex.g_field->fld_seg_length = (USHORT) yyvsp[-1];
++			lex.g_field->fld_seg_length = (USHORT)(IPTR) yyvsp[-1];
+ 			lex.g_field->fld_sub_type = 0;
+ 			}
+ break;
+ case 508:
+ { 
+ 			lex.g_field->fld_dtype = dtype_blob; 
+-			lex.g_field->fld_seg_length = (USHORT) yyvsp[-3];
+-			lex.g_field->fld_sub_type = (USHORT) yyvsp[-1];
++			lex.g_field->fld_seg_length = (USHORT)(IPTR) yyvsp[-3];
++			lex.g_field->fld_sub_type = (USHORT)(IPTR) yyvsp[-1];
+ 			}
+ break;
+ case 509:
+ { 
+ 			lex.g_field->fld_dtype = dtype_blob; 
+ 			lex.g_field->fld_seg_length = 80;
+-			lex.g_field->fld_sub_type = (USHORT) yyvsp[-1];
++			lex.g_field->fld_sub_type = (USHORT)(IPTR) yyvsp[-1];
+ 			}
+ break;
+ case 510:
+ {
+-			lex.g_field->fld_seg_length = (USHORT) yyvsp[0];
++			lex.g_field->fld_seg_length = (USHORT)(IPTR) yyvsp[0];
+ 		  	}
+ break;
+ case 511:
+@@ -7571,7 +7571,7 @@
+ break;
+ case 512:
+ {
+-			lex.g_field->fld_sub_type = (USHORT) yyvsp[0];
++			lex.g_field->fld_sub_type = (USHORT)(IPTR) yyvsp[0];
+ 			}
+ break;
+ case 513:
+@@ -7592,7 +7592,7 @@
+ case 517:
+ { 
+ 			lex.g_field->fld_dtype = dtype_text; 
+-			lex.g_field->fld_character_length = (USHORT) yyvsp[-1]; 
++			lex.g_field->fld_character_length = (USHORT)(IPTR) yyvsp[-1]; 
+ 			lex.g_field->fld_flags |= FLD_national;
+ 			}
+ break;
+@@ -7606,14 +7606,14 @@
+ case 519:
+ { 
+ 			lex.g_field->fld_dtype = dtype_varying; 
+-			lex.g_field->fld_character_length = (USHORT) yyvsp[-1]; 
++			lex.g_field->fld_character_length = (USHORT)(IPTR) yyvsp[-1]; 
+ 			lex.g_field->fld_flags |= FLD_national;
+ 			}
+ break;
+ case 520:
+ { 
+ 			lex.g_field->fld_dtype = dtype_text; 
+-			lex.g_field->fld_character_length = (USHORT) yyvsp[-1]; 
++			lex.g_field->fld_character_length = (USHORT)(IPTR) yyvsp[-1]; 
+ 			}
+ break;
+ case 521:
+@@ -7625,7 +7625,7 @@
+ case 522:
+ { 
+ 			lex.g_field->fld_dtype = dtype_varying; 
+-			lex.g_field->fld_character_length = (USHORT) yyvsp[-1]; 
++			lex.g_field->fld_character_length = (USHORT)(IPTR) yyvsp[-1]; 
+ 			}
+ break;
+ case 531:
+@@ -7705,7 +7705,7 @@
+ 			    	lex.g_field->fld_dtype = dtype_long; 
+ 			    	lex.g_field->fld_length = sizeof (SLONG); 
+ 			    	}
+-			lex.g_field->fld_precision = (USHORT) yyvsp[-1];
++			lex.g_field->fld_precision = (USHORT)(IPTR) yyvsp[-1];
+ 			}
+ break;
+ case 536:
+@@ -7765,8 +7765,8 @@
+ 			    	lex.g_field->fld_length = sizeof (SLONG); 
+ 			    	}
+ 			    }
+-			lex.g_field->fld_precision = (USHORT) yyvsp[-3];
+-			lex.g_field->fld_scale = - (SSHORT) yyvsp[-1];
++			lex.g_field->fld_precision = (USHORT)(IPTR) yyvsp[-3];
++			lex.g_field->fld_scale = - (SSHORT)(IPTR) yyvsp[-1];
+ 			}
+ break;
+ case 539:
+@@ -7932,7 +7932,7 @@
+ { yyval = make_node (nod_table_lock, (int) 2, make_list (yyvsp[-1]), yyvsp[0]); }
+ break;
+ case 602:
+-{ yyval = make_flag_node (nod_lock_mode, (SSHORT) ((SSHORT) yyvsp[-1] | (SSHORT) yyvsp[0]), (SSHORT) 0, NULL); }
++{ yyval = make_flag_node (nod_lock_mode, (SSHORT) ((SSHORT)(IPTR) yyvsp[-1] | (SSHORT)(IPTR) yyvsp[0]), (SSHORT) 0, NULL); }
+ break;
+ case 603:
+ { yyval = 0; }
+diff -ur firebird-1.5.3.4870-orig/src/gpre/c_cxx.cpp firebird-1.5.3.4870/src/gpre/c_cxx.cpp
+--- firebird-1.5.3.4870-orig/src/gpre/c_cxx.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/gpre/c_cxx.cpp	2006-03-17 01:32:18.000000000 -0500
 @@ -2184,7 +2184,7 @@
  
  	args.pat_database = (DBB) init->nod_arg[3];
@@ -249,9 +422,9 @@
  			database = (DBB) event_init->nod_arg[3];
  		}
  	}
-diff -urNad firebird2-1.5.3.4870~/src/gpre/cmd.cpp firebird2-1.5.3.4870/src/gpre/cmd.cpp
---- firebird2-1.5.3.4870~/src/gpre/cmd.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/gpre/cmd.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/gpre/cmd.cpp firebird-1.5.3.4870/src/gpre/cmd.cpp
+--- firebird-1.5.3.4870-orig/src/gpre/cmd.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/gpre/cmd.cpp	2006-03-17 01:32:18.000000000 -0500
 @@ -204,7 +204,7 @@
  
  	case ACT_drop_shadow:
@@ -261,9 +434,9 @@
  		STUFF_END;
  		break;
  
-diff -urNad firebird2-1.5.3.4870~/src/gpre/cme.cpp firebird2-1.5.3.4870/src/gpre/cme.cpp
---- firebird2-1.5.3.4870~/src/gpre/cme.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/gpre/cme.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/gpre/cme.cpp firebird-1.5.3.4870/src/gpre/cme.cpp
+--- firebird-1.5.3.4870-orig/src/gpre/cme.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/gpre/cme.cpp	2006-03-17 01:32:18.000000000 -0500
 @@ -251,7 +251,7 @@
  // ** Begin date/time/timestamp support *
  	case nod_extract:
@@ -282,9 +455,9 @@
  			CME_get_dtype(node->nod_arg[1], f);
  			switch (f->fld_dtype)
  			{
-diff -urNad firebird2-1.5.3.4870~/src/gpre/cob.cpp firebird2-1.5.3.4870/src/gpre/cob.cpp
---- firebird2-1.5.3.4870~/src/gpre/cob.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/gpre/cob.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/gpre/cob.cpp firebird-1.5.3.4870/src/gpre/cob.cpp
+--- firebird-1.5.3.4870-orig/src/gpre/cob.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/gpre/cob.cpp	2006-03-17 01:32:18.000000000 -0500
 @@ -382,7 +382,7 @@
  static void	gen_on_error (ACT);
  static void	gen_procedure (ACT);
@@ -348,9 +521,9 @@
  }
  
  
-diff -urNad firebird2-1.5.3.4870~/src/gpre/pat.h firebird2-1.5.3.4870/src/gpre/pat.h
---- firebird2-1.5.3.4870~/src/gpre/pat.h	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/gpre/pat.h	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/gpre/pat.h firebird-1.5.3.4870/src/gpre/pat.h
+--- firebird-1.5.3.4870-orig/src/gpre/pat.h	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/gpre/pat.h	2006-03-17 01:32:18.000000000 -0500
 @@ -85,7 +85,7 @@
  	USHORT pat_ident2;
  	TEXT *pat_vector1;
@@ -360,9 +533,9 @@
  	int pat_value2;
  	int pat_value3;
  	int pat_value4;
-diff -urNad firebird2-1.5.3.4870~/src/jrd/blb.cpp firebird2-1.5.3.4870/src/jrd/blb.cpp
---- firebird2-1.5.3.4870~/src/jrd/blb.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/blb.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/blb.cpp firebird-1.5.3.4870/src/jrd/blb.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/blb.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/blb.cpp	2006-03-17 01:32:28.000000000 -0500
 @@ -860,8 +860,8 @@
  	request = tdbb->tdbb_request;
  	source = (BID) from_desc->dsc_address;
@@ -374,9 +547,9 @@
  	relation = rpb->rpb_relation;
  	record = rpb->rpb_record;
  
-diff -urNad firebird2-1.5.3.4870~/src/jrd/cmp.cpp firebird2-1.5.3.4870/src/jrd/cmp.cpp
---- firebird2-1.5.3.4870~/src/jrd/cmp.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/cmp.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/cmp.cpp firebird-1.5.3.4870/src/jrd/cmp.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/cmp.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/cmp.cpp	2006-03-17 01:32:29.000000000 -0500
 @@ -958,9 +958,9 @@
  			FMT format;
  			USHORT id;
@@ -890,9 +1063,9 @@
  			return TRUE;		/* do not mark as variant */
  	}
  
-diff -urNad firebird2-1.5.3.4870~/src/jrd/common.h firebird2-1.5.3.4870/src/jrd/common.h
---- firebird2-1.5.3.4870~/src/jrd/common.h	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/common.h	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/common.h firebird-1.5.3.4870/src/jrd/common.h
+--- firebird-1.5.3.4870-orig/src/jrd/common.h	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/common.h	2006-03-17 01:32:29.000000000 -0500
 @@ -856,8 +856,8 @@
  
  #define JRD_BUGCHK 15			/* facility code for bugcheck messages */
@@ -904,9 +1077,9 @@
  #endif
  
  #ifndef ODS_ALIGNMENT
-diff -urNad firebird2-1.5.3.4870~/src/jrd/dpm.epp firebird2-1.5.3.4870/src/jrd/dpm.epp
---- firebird2-1.5.3.4870~/src/jrd/dpm.epp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/dpm.epp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/dpm.epp firebird-1.5.3.4870/src/jrd/dpm.epp
+--- firebird-1.5.3.4870-orig/src/jrd/dpm.epp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/dpm.epp	2006-03-17 01:32:29.000000000 -0500
 @@ -2119,7 +2119,7 @@
  
  	DEBUG if (stack)
@@ -925,9 +1098,9 @@
  	CCH_MARK(tdbb, &rpb->rpb_window);
  	i = page->dpg_count + ((slot) ? 0 : 1);
  
-diff -urNad firebird2-1.5.3.4870~/src/jrd/evl.cpp firebird2-1.5.3.4870/src/jrd/evl.cpp
---- firebird2-1.5.3.4870~/src/jrd/evl.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/evl.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/evl.cpp firebird-1.5.3.4870/src/jrd/evl.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/evl.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/evl.cpp	2006-03-17 01:32:29.000000000 -0500
 @@ -248,7 +248,7 @@
  		arg_number = (int)(IPTR)node->nod_arg[e_arg_number];
  		desc = &format->fmt_desc[arg_number];
@@ -1056,9 +1229,9 @@
  
  /* If the current transaction has updated the record, the record version
   * coming in from DSQL will have the original transaction # (or current
-diff -urNad firebird2-1.5.3.4870~/src/jrd/exe.cpp firebird2-1.5.3.4870/src/jrd/exe.cpp
---- firebird2-1.5.3.4870~/src/jrd/exe.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/exe.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/exe.cpp firebird-1.5.3.4870/src/jrd/exe.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/exe.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/exe.cpp	2006-03-17 01:32:29.000000000 -0500
 @@ -375,8 +375,8 @@
  
  	if (to->nod_type == nod_field)
@@ -1194,9 +1367,9 @@
  				relation = request->req_rpb[stream].rpb_relation;
  
  				if ((vector = relation->rel_fields) &&
-diff -urNad firebird2-1.5.3.4870~/src/jrd/ext.cpp firebird2-1.5.3.4870/src/jrd/ext.cpp
---- firebird2-1.5.3.4870~/src/jrd/ext.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/ext.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/ext.cpp firebird-1.5.3.4870/src/jrd/ext.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/ext.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/ext.cpp	2006-03-17 01:32:29.000000000 -0500
 @@ -266,7 +266,7 @@
  	record = rpb->rpb_record;
  	format = record->rec_format;
@@ -1233,10 +1406,10 @@
  	p = record->rec_data + offset;
  	l = record->rec_length - offset;
  
-diff -urNad firebird2-1.5.3.4870~/src/jrd/gds.cpp firebird2-1.5.3.4870/src/jrd/gds.cpp
---- firebird2-1.5.3.4870~/src/jrd/gds.cpp	2006-02-01 23:07:03.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/gds.cpp	2006-02-01 23:07:04.000000000 +0200
-@@ -2287,7 +2287,7 @@
+diff -ur firebird-1.5.3.4870-orig/src/jrd/gds.cpp firebird-1.5.3.4870/src/jrd/gds.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/gds.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/gds.cpp	2006-03-17 01:32:30.000000000 -0500
+@@ -2304,7 +2304,7 @@
  		return result;
  
  	if (stdio_flag)
@@ -1245,9 +1418,9 @@
  			return (void *)-1;
  
  	if (expanded_string)
-diff -urNad firebird2-1.5.3.4870~/src/jrd/idx.cpp firebird2-1.5.3.4870/src/jrd/idx.cpp
---- firebird2-1.5.3.4870~/src/jrd/idx.cpp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/idx.cpp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/idx.cpp firebird-1.5.3.4870/src/jrd/idx.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/idx.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/idx.cpp	2006-03-17 01:32:30.000000000 -0500
 @@ -1055,12 +1055,12 @@
  			 index_number < idx->idx_foreign_primaries->count();
  			 index_number++) {
@@ -1264,9 +1437,9 @@
  			if ( (result =
  				check_partner_index(tdbb, relation, record, transaction, idx,
  									partner_relation, index_id)) )
-diff -urNad firebird2-1.5.3.4870~/src/jrd/inf.cpp firebird2-1.5.3.4870/src/jrd/inf.cpp
---- firebird2-1.5.3.4870~/src/jrd/inf.cpp	2003-06-08 16:13:23.000000000 +0300
-+++ firebird2-1.5.3.4870/src/jrd/inf.cpp	2006-02-01 23:07:23.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/inf.cpp firebird-1.5.3.4870/src/jrd/inf.cpp
+--- firebird-1.5.3.4870-orig/src/jrd/inf.cpp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/inf.cpp	2006-03-17 01:32:30.000000000 -0500
 @@ -972,7 +972,7 @@
  			node = request->req_message;
  			if (item == gds_info_message_number)
@@ -1276,9 +1449,9 @@
  								buffer_ptr);
  			else {
  				format = (FMT) node->nod_arg[e_msg_format];
-diff -urNad firebird2-1.5.3.4870~/src/jrd/met.epp firebird2-1.5.3.4870/src/jrd/met.epp
---- firebird2-1.5.3.4870~/src/jrd/met.epp	2006-02-01 23:07:02.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/met.epp	2006-02-01 23:07:04.000000000 +0200
+diff -ur firebird-1.5.3.4870-orig/src/jrd/met.epp firebird-1.5.3.4870/src/jrd/met.epp
+--- firebird-1.5.3.4870-orig/src/jrd/met.epp	2006-03-17 01:39:04.000000000 -0500
++++ firebird-1.5.3.4870/src/jrd/met.epp	2006-03-17 01:32:31.000000000 -0500
 @@ -932,7 +932,7 @@
  			if (desc->dsc_address)
  			{
@@ -1361,220 +1534,9 @@
  				if (relation)
  				{
  					if ( (field = MET_get_field(relation, fld_id)) )
-diff -urNad firebird2-1.5.3.4870~/src/jrd/sdl.cpp firebird2-1.5.3.4870/src/jrd/sdl.cpp
---- firebird2-1.5.3.4870~/src/jrd/sdl.cpp	2006-02-01 23:07:03.000000000 +0200
-+++ firebird2-1.5.3.4870/src/jrd/sdl.cpp	2006-02-01 23:07:04.000000000 +0200
-@@ -699,7 +699,7 @@
- 			}
- 			element_desc = array_desc->ads_rpt[value].ads_desc;
- 			element_desc.dsc_address = (BLOB_PTR *) arg->sdl_arg_array +
--				(SLONG) element_desc.dsc_address +
-+				(SLONG)(IPTR) element_desc.dsc_address +
- 				(array_desc->ads_element_length * subscript);
- 
- 			/* Is this element within the array bounds? */
-
---- Firebird.org/src/jrd/jrd.cpp~	2004-11-17 12:41:16.000000000 +0100
-+++ Firebird/src/jrd/jrd.cpp	2006-03-28 18:47:32.722559750 +0200
-@@ -3877,9 +3877,9 @@
- 	{
- 		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;
--			} else if ((int) node->nod_arg[e_msg_number] == 1) {
-+			} else if ((int)(IPTR) node->nod_arg[e_msg_number] == 1) {
- 				out_message = node;
- 			}
- 		}
---- Firebird.org/src/jrd/jrn.cpp.org	2006-03-28 18:52:47.582237250 +0200
-+++ Firebird/src/jrd/jrn.cpp	2006-03-28 18:54:06.667179750 +0200
-@@ -836,7 +836,7 @@
- 	for (loop = 0; loop < 20; loop++) {
- 		for (;;) {
- 			journal->jrn_channel = (int *) socket(AF_INET, SOCK_STREAM, 0);
--			if ((int) journal->jrn_channel != -1)
-+			if ((int)(IPTR) journal->jrn_channel != -1)
- 				break;
- 			if (!SYSCALL_INTERRUPTED(errno)) {
- 				error(status_vector, journal, errno, "socket");
-@@ -859,18 +859,18 @@
- 			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;
- 
- 		sleep(3);
- 
- 		if (loop < 16) {
--			close((int) journal->jrn_channel);
-+			close((int)(IPTR) journal->jrn_channel);
- 			continue;
- 		}
- 		if (!SYSCALL_INTERRUPTED(errno)) {
- 			if (retry) {
--				close((int) journal->jrn_channel);
-+				close((int)(IPTR) journal->jrn_channel);
- 				gds__free(journal);
- 				*ret_jrn = (JRN) NULL;
- 				return FB_SUCCESS;
-@@ -879,7 +879,7 @@
- 			gds__free(journal);
- 			return FB_FAILURE;
- 		}
--		close((int) journal->jrn_channel);
-+		close((int)(IPTR) journal->jrn_channel);
- 	}
- #endif
- 
-@@ -939,7 +939,7 @@
- 		if (retry)
- 		{
- #ifdef BSD_SOCKETS
--			close((int) journal->jrn_channel);
-+			close((int)(IPTR) journal->jrn_channel);
- #endif
- 
- #ifdef WIN_NT
-@@ -1056,7 +1056,7 @@
-     with us, so keep trying until successful.  */
- 
- 	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));
- 
- 	if (l < 0) {
-@@ -1095,7 +1095,7 @@
-  **************************************/
- 
- #ifdef BSD_SOCKETS
--	if (close((int) journal->jrn_channel) < 0) {
-+	if (close((int)(IPTR) journal->jrn_channel) < 0) {
- 		error(status_vector, journal, errno, "close");
- 		return FB_FAILURE;
- 	}
-@@ -1166,7 +1166,7 @@
-     with us, so keep trying until successful.  */
- 
- 	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));
- 
- 	if (l < 0) {
---- Firebird.org/src/jrd/nav.cpp.org	2006-03-28 19:04:53.447601000 +0200
-+++ Firebird/src/jrd/nav.cpp	2006-03-28 19:08:20.452538000 +0200
-@@ -487,7 +487,7 @@
- 
- 	init_fetch(impure);
- 	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 
-    direction.  It is of no help when we change direction,
-@@ -521,12 +521,12 @@
- #ifdef SCROLLABLE_CURSORS
- 		MOVE_FAST(
- 				  (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);
- #else
- 		MOVE_FAST(
- 				  (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);
- #endif
- 	}
-@@ -534,7 +534,7 @@
- 		lower.key_length = impure->irsb_nav_lower_length;
- 		MOVE_FAST(
- 				  (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);
- 	}
- 
-@@ -1404,7 +1404,7 @@
- 	tdbb = GET_THREAD_DATA;
- 
- 	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);
- 
- /* the outer loop goes through all the sibling pages
-@@ -1619,7 +1619,7 @@
- 	tdbb = GET_THREAD_DATA;
- 	request = tdbb->tdbb_request;
- 	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;
- 
-@@ -1656,7 +1656,7 @@
- 				rpb->rpb_record,
- 				reinterpret_cast <
- 				struct idx *>((SCHAR *) impure +
--							  (SLONG) rsb->rsb_arg[RSB_NAV_idx_offset]),
-+							  (SLONG)(IPTR) rsb->rsb_arg[RSB_NAV_idx_offset]),
- 				&value,
- 				0);
- 		if (compare_keys(idx, key->key_data, key->key_length, &value, FALSE)) {
-@@ -1757,7 +1757,7 @@
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/Firebird-gcc4.patch?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list