Author: qboosh Date: Sun Feb 18 08:55:55 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.5.4.4910
---- Files affected:
SOURCES:
Firebird-fix-pthreads-detect.dpatch (1.1 -> 1.2) , Firebird-gcc4.patch (1.6
-> 1.7) , Firebird-link-with-g++.dpatch (1.1 -> 1.2) , Firebird-morearchs.patch
(1.6 -> 1.7) , Firebird-no-custom-errno-and-sys_XXerrXX.dpatch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/Firebird-fix-pthreads-detect.dpatch
diff -u SOURCES/Firebird-fix-pthreads-detect.dpatch:1.1
SOURCES/Firebird-fix-pthreads-detect.dpatch:1.2
--- SOURCES/Firebird-fix-pthreads-detect.dpatch:1.1 Tue Mar 28 20:24:52 2006
+++ SOURCES/Firebird-fix-pthreads-detect.dpatch Sun Feb 18 09:55:49 2007
@@ -6,8 +6,8 @@
@DPATCH@
---- firebird2-1.5.2.orig/src/common/classes/locks.h
-+++ firebird2-1.5.2/src/common/classes/locks.h
+--- firebird-1.5.4.4910/src/common/classes/locks.h.orig 2007-01-22
13:27:50.000000000 +0100
++++ firebird-1.5.4.4910/src/common/classes/locks.h 2007-02-17
23:02:48.169652007 +0100
@@ -29,24 +29,22 @@
#include "firebird.h"
@@ -42,8 +42,8 @@
/* Process-local spinlock. Used to manage memory heaps in threaded
environment. */
// Pthreads version of the class
--#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD)
-+#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) &&
!defined(_POSIX_THREAD_IS_GNU_PTH)
+-#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) &&
!defined(AIX) && !defined(HPUX)
++#if !defined(SOLARIS) && !defined(DARWIN) && !defined(FREEBSD) &&
!defined(AIX) && !defined(HPUX) && !defined(_POSIX_THREAD_IS_GNU_PTH)
class Spinlock {
private:
pthread_spinlock_t spinlock;
@@ -51,8 +51,8 @@
system_call_failed::raise();
}
};
--#else // DARWIN and FREEBSD
-+#else // DARWIN, FREEBSD and gnu pth
+-#else // DARWIN, FREEBSD, AIX, HPUX
++#else // DARWIN, FREEBSD, AIX, HPUX and gnu pth
class Spinlock {
private:
pthread_mutex_t mlock;
================================================================
Index: SOURCES/Firebird-gcc4.patch
diff -u SOURCES/Firebird-gcc4.patch:1.6 SOURCES/Firebird-gcc4.patch:1.7
--- SOURCES/Firebird-gcc4.patch:1.6 Sun Aug 20 15:39:41 2006
+++ SOURCES/Firebird-gcc4.patch Sun Feb 18 09:55:50 2007
@@ -1,3277 +1,31 @@
-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 @@
+--- firebird-1.5.4.4910/src/common/classes/alloc.h.orig 2006-11-05
15:37:52.000000000 +0100
++++ firebird-1.5.4.4910/src/common/classes/alloc.h 2007-02-17
23:15:18.116389037 +0100
+@@ -241,7 +241,7 @@
+
+ void operator delete[](void* mem) throw();
+
+-#ifdef AIX
++#if defined(AIX) || __GNUC__ >= 4
+ #define FB_STATIC_INLINE_NEW inline
+ #else
+ #define FB_STATIC_INLINE_NEW static inline
+--- firebird-1.5.4.4910/src/burp/burp.cpp.orig 2006-11-05 15:37:49.000000000
+0100
++++ firebird-1.5.4.4910/src/burp/burp.cpp 2007-02-17 23:46:15.538237476
+0100
+@@ -1596,7 +1596,7 @@
#ifndef WIN_NT
signal(SIGPIPE, SIG_IGN);
#endif
- fil->fil_fd =
reinterpret_cast<DESC>(GBAK_STDOUT_DESC);
-+ fil->fil_fd = GBAK_STDOUT_DESC();
++ fil->fil_fd =
static_cast<DESC>(GBAK_STDOUT_DESC);
break;
}
else
-@@ -1724,7 +1724,7 @@
+@@ -1714,7 +1714,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();
++ fil->fil_fd = static_cast<DESC>(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();
-
-+#if __GNUC__ < 4
-+#define STATIC_NEW static
-+#else
-+#define STATIC_NEW
-+#endif
-+
- #ifdef DEBUG_GDS_ALLOC
--static inline void* operator new(size_t s, Firebird::MemoryPool& pool, char*
file, int line) {
-+STATIC_NEW inline void* operator new(size_t s, Firebird::MemoryPool& pool,
char* file, int line) {
- return pool.allocate(s, 0, file, line);
- // return pool.calloc(s, 0, file, line);
- }
--static inline void* operator new[](size_t s, Firebird::MemoryPool& pool,
char* file, int line) {
-+STATIC_NEW inline void* operator new[](size_t s, Firebird::MemoryPool& pool,
char* file, int line) {
- return pool.allocate(s, 0, file, line);
- // return pool.calloc(s, 0, file, line);
- }
- #define FB_NEW(pool) new(pool,__FILE__,__LINE__)
- #define FB_NEW_RPT(pool,count) new(pool,count,__FILE__,__LINE__)
- #else
--static inline void* operator new(size_t s, Firebird::MemoryPool& pool) {
-+STATIC_NEW inline void* operator new(size_t s, Firebird::MemoryPool& pool) {
- return pool.allocate(s);
- // return pool.calloc(s);
- }
--static inline void* operator new[](size_t s, Firebird::MemoryPool& pool) {
-+STATIC_NEW inline void* operator new[](size_t s, Firebird::MemoryPool& pool) {
- return pool.allocate(s);
- // return pool.calloc(s);
- }
-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()
- {
-- return (int) sysConfig.values[KEY_SORT_MEM_BLOCK_SIZE];
-+ return (int)(IPTR) sysConfig.values[KEY_SORT_MEM_BLOCK_SIZE];
- }
-
- int Config::getSortMemUpperLimit()
- {
-- return (int) sysConfig.values[KEY_SORT_MEM_UPPER_LIMIT];
-+ return (int)(IPTR) sysConfig.values[KEY_SORT_MEM_UPPER_LIMIT];
- }
-
- bool Config::getRemoteFileOpenAbility()
-@@ -276,12 +276,12 @@
-
- int Config::getGuardianOption()
- {
-- return (int) sysConfig.values[KEY_GUARDIAN_OPTION];
-+ return (int)(IPTR) sysConfig.values[KEY_GUARDIAN_OPTION];
- }
-
- int Config::getCpuAffinityMask()
- {
-- return (int) sysConfig.values[KEY_CPU_AFFINITY_MASK];
-+ return (int)(IPTR) sysConfig.values[KEY_CPU_AFFINITY_MASK];
- }
-
- bool Config::getOldParameterOrdering()
-@@ -291,7 +291,7 @@
-
- int Config::getTcpRemoteBufferSize()
- {
-- return (int) sysConfig.values[KEY_TCP_REMOTE_BUFFER_SIZE];
-+ return (int)(IPTR) sysConfig.values[KEY_TCP_REMOTE_BUFFER_SIZE];
- }
-
- bool Config::getTcpNoNagle()
-@@ -301,37 +301,37 @@
-
- int Config::getIpcMapSize()
- {
-- return (int) sysConfig.values[KEY_IPC_MAP_SIZE];
-+ return (int)(IPTR) sysConfig.values[KEY_IPC_MAP_SIZE];
- }
-
- int Config::getDefaultDbCachePages()
- {
-- return (int) sysConfig.values[KEY_DEFAULT_DB_CACHE_PAGES];
-+ return (int)(IPTR) sysConfig.values[KEY_DEFAULT_DB_CACHE_PAGES];
- }
-
- int Config::getConnectionTimeout()
- {
-- return (int) sysConfig.values[KEY_CONNECTION_TIMEOUT];
-+ return (int)(IPTR) sysConfig.values[KEY_CONNECTION_TIMEOUT];
- }
-
- int Config::getDummyPacketInterval()
- {
-- return (int) sysConfig.values[KEY_DUMMY_PACKET_INTERVAL];
-+ return (int)(IPTR) sysConfig.values[KEY_DUMMY_PACKET_INTERVAL];
- }
-
- int Config::getLockMemSize()
- {
-- return (int) sysConfig.values[KEY_LOCK_MEM_SIZE];
-+ return (int)(IPTR) sysConfig.values[KEY_LOCK_MEM_SIZE];
- }
-
- int Config::getLockSemCount()
- {
-- return (int) sysConfig.values[KEY_LOCK_SEM_COUNT];
-+ return (int)(IPTR) sysConfig.values[KEY_LOCK_SEM_COUNT];
- }
-
- int Config::getLockSignal()
- {
-- return (int) sysConfig.values[KEY_LOCK_SIGNAL];
-+ return (int)(IPTR) sysConfig.values[KEY_LOCK_SIGNAL];
- }
-
- bool Config::getLockGrantOrder()
-@@ -341,27 +341,27 @@
-
- int Config::getLockHashSlots()
- {
-- return (int) sysConfig.values[KEY_LOCK_HASH_SLOTS];
-+ return (int)(IPTR) sysConfig.values[KEY_LOCK_HASH_SLOTS];
- }
-
- int Config::getLockAcquireSpins()
- {
-- return (int) sysConfig.values[KEY_LOCK_ACQUIRE_SPINS];
-+ return (int)(IPTR) sysConfig.values[KEY_LOCK_ACQUIRE_SPINS];
- }
-
- int Config::getEventMemSize()
- {
-- return (int) sysConfig.values[KEY_EVENT_MEM_SIZE];
-+ return (int)(IPTR) sysConfig.values[KEY_EVENT_MEM_SIZE];
- }
-
- int Config::getDeadlockTimeout()
- {
-- return (int) sysConfig.values[KEY_DEADLOCK_TIMEOUT];
-+ return (int)(IPTR) sysConfig.values[KEY_DEADLOCK_TIMEOUT];
- }
-
- int Config::getSolarisStallValue()
- {
-- return (int) sysConfig.values[KEY_SOLARIS_STALL_VALUE];
-+ return (int)(IPTR) sysConfig.values[KEY_SOLARIS_STALL_VALUE];
- }
-
- bool Config::getTraceMemoryPools()
-@@ -371,7 +371,7 @@
-
- int Config::getPrioritySwitchDelay()
- {
-- int rc = (int) sysConfig.values[KEY_PRIORITY_SWITCH_DELAY];
-+ int rc = (int)(IPTR) sysConfig.values[KEY_PRIORITY_SWITCH_DELAY];
- if (rc < 1)
- rc = 1;
- return rc;
-@@ -379,7 +379,7 @@
-
- int Config::getDeadThreadsCollection()
- {
-- int rc = (int) sysConfig.values[KEY_DEAD_THREADS_COLLECTION];
-+ int rc = (int)(IPTR) sysConfig.values[KEY_DEAD_THREADS_COLLECTION];
- if (rc < 1)
- rc = 1;
- return rc;
-@@ -387,7 +387,7 @@
-
- int Config::getPriorityBoost()
- {
-- int rc = (int) sysConfig.values[KEY_PRIORITY_BOOST];
-+ int rc = (int)(IPTR) sysConfig.values[KEY_PRIORITY_BOOST];
- if (rc < 1)
- rc = 1;
- if (rc > 1000)
-@@ -402,7 +402,7 @@
-
- int Config::getRemoteServicePort()
- {
-- return (int) sysConfig.values[KEY_REMOTE_SERVICE_PORT];
-+ return (int)(IPTR) sysConfig.values[KEY_REMOTE_SERVICE_PORT];
- }
-
- const char *Config::getRemotePipeName()
-@@ -417,17 +417,17 @@
-
- int Config::getMaxUnflushedWrites()
- {
-- return (int) sysConfig.values[KEY_MAX_UNFLUSHED_WRITES];
-+ return (int)(IPTR) sysConfig.values[KEY_MAX_UNFLUSHED_WRITES];
- }
-
- int Config::getMaxUnflushedWriteTime()
- {
-- return (int) sysConfig.values[KEY_MAX_UNFLUSHED_WRITE_TIME];
-+ return (int)(IPTR) sysConfig.values[KEY_MAX_UNFLUSHED_WRITE_TIME];
- }
-
- int Config::getProcessPriorityLevel()
- {
-- return (int) sysConfig.values[KEY_PROCESS_PRIORITY_LEVEL];
-+ return (int)(IPTR) sysConfig.values[KEY_PROCESS_PRIORITY_LEVEL];
- }
-
- bool Config::getCreateInternalWindow()
-@@ -443,7 +443,7 @@
- int Config::getRemoteAuxPort()
- {
- #ifdef SUPERSERVER
-- return (int) sysConfig.values[KEY_REMOTE_AUX_PORT];
-+ return (int)(IPTR) sysConfig.values[KEY_REMOTE_AUX_PORT];
- #else
- return 0;
- #endif
-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];
- args.pat_vector1 = status_vector(action);
-- args.pat_long1 = (int) init->nod_arg[2];
-+ args.pat_long1 = (int)(IPTR) init->nod_arg[2];
- args.pat_value2 = (int) event_list->nod_count;
-
- // generate call to dynamically generate event blocks
-@@ -2255,7 +2255,7 @@
- event_init = (GPRE_NOD) event_action->act_object;
- stack_name = (SYM) event_init->nod_arg[0];
- if (!strcmp(event_name->sym_string, stack_name->sym_string)) {
-- ident = (int) event_init->nod_arg[2];
-+ ident = (int)(IPTR) event_init->nod_arg[2];
- database = (DBB) event_init->nod_arg[3];
- }
- }
-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:
- put_numeric(request, gds_dyn_delete_shadow,
-- (SSHORT) action->act_object);
-+ (SSHORT)(IPTR) action->act_object);
- STUFF_END;
- break;
-
-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:
- STUFF(blr_extract);
-- switch ((KWWORDS) (int) node->nod_arg[0])
-+ switch ((KWWORDS) (int)(IPTR) node->nod_arg[1])
- {
- case KW_YEAR:
- STUFF(blr_extract_year);
-@@ -478,7 +478,7 @@
- // ** Begin date/time/timestamp support *
- case nod_extract:
- {
-- KWWORDS kw_word = (KWWORDS) (int) node->nod_arg[0];
-+ KWWORDS kw_word = (KWWORDS) (int)(IPTR)
node->nod_arg[0];
- CME_get_dtype(node->nod_arg[1], f);
- switch (f->fld_dtype)
- {
-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);
- static void gen_put_segment (ACT);
--static void gen_raw (UCHAR *, enum req_t, int, int);
-+static void gen_raw (UCHAR *, enum req_t, int, IPTR);
- static void gen_ready (ACT);
- static void gen_receive (ACT, POR);
- static void gen_release (ACT);
-@@ -2656,7 +2656,7 @@
-
- args.pat_database = (DBB) init->nod_arg[3];
- args.pat_vector1 = status_vector(action);
-- args.pat_value1 = (int) init->nod_arg[2];
-+ args.pat_value1 = (IPTR) init->nod_arg[2];
- args.pat_value2 = (int) event_list->nod_count;
- args.pat_string1 = ISC_EVENT_BLOCK;
- args.pat_string2 = ISC_EVENT_WAIT;
-@@ -2712,7 +2712,7 @@
- LLS stack_ptr;
- ACT event_action;
- SSHORT column;
-- int ident;
-+ IPTR ident;
- TEXT s[64];
- TEXT *pattern1 =
- "CALL \"%S2\" USING %V1, %RF%DH%RE, %VF%S4%N1L%VE,
%VF%S4%N1A%VE, %VF%S4%N1B%VE";
-@@ -2730,7 +2730,7 @@
- event_init = (GPRE_NOD) event_action->act_object;
- stack_name = (SYM) event_init->nod_arg[0];
- if (!strcmp(event_name->sym_string, stack_name->sym_string)) {
-- ident = (int) event_init->nod_arg[2];
-+ ident = (IPTR) event_init->nod_arg[2];
- database = (DBB) event_init->nod_arg[3];
- }
- }
-@@ -3845,7 +3845,7 @@
-
- static void gen_raw(
- UCHAR * blr,
-- enum req_t request_type, int request_length, int
ident)
-+ enum req_t request_type, int request_length, IPTR
ident)
- {
- UCHAR *c;
- TEXT s[256];
-@@ -4193,7 +4193,7 @@
- printa(names[COLUMN_0], FALSE, "01 %s%d.",
- names[ISC_], blob->blb_bpb_ident);
- gen_raw(blob->blb_bpb, request->req_type,
blob->blb_bpb_length,
-- (int) request);
-+ (IPTR) request);
- printa(names[COMMENT], FALSE, " ");
- }
- #ifdef PYXIS
-@@ -4703,7 +4703,7 @@
- static void gen_type( ACT action)
- {
-
-- printa(names[COLUMN], TRUE, "%ld", action->act_object);
-+ printa(names[COLUMN], TRUE, "%ld", (IPTR) action->act_object);
- }
-
-
-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;
- TEXT *pat_vector2;
-- int pat_value1;
-+ IPTR pat_value1;
- int pat_value2;
- int pat_value3;
- int pat_value4;
-diff -ur firebird-1.5.3.4870-orig/src/jrd/blb.cpp
firebird-1.5.3.4870/src/jrd/blb.cpp
<<Diff was trimmed, longer than 597 lines>>
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/Firebird-fix-pthreads-detect.dpatch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/Firebird-gcc4.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/Firebird-link-with-g++.dpatch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/SOURCES/Firebird-morearchs.patch?r1=1.6&r2=1.7&f=u
http://cvs.pld-linux.org/SOURCES/Firebird-no-custom-errno-and-sys_XXerrXX.dpatch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
