8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 19:23:03 +01:00
This commit is contained in:
asfernandes 2007-11-11 18:59:54 +00:00
parent 450b549d85
commit 1422aacc29
10 changed files with 9 additions and 18 deletions

View File

@ -827,7 +827,7 @@ public:
USHORT RESTORE_format;
ULONG mvol_io_buffer_size;
ULONG mvol_actual_buffer_size;
FB_UINT64 mvol_cumul_count;
FB_UINT64 mvol_cumul_count;
UCHAR* mvol_io_ptr;
int mvol_io_cnt;
UCHAR* mvol_io_buffer;

View File

@ -27,9 +27,6 @@
* 2002.10.30 Sean Leyne - Removed support for obsolete "PC_PLATFORM" define
*
*/
/*
$Id: canonical.cpp,v 1.36.4.1 2007-11-08 15:26:00 paulbeach Exp $
*/
#include "firebird.h"
#include <stdio.h>

View File

@ -27,8 +27,8 @@
#include "../burp/burp.h"
FB_UINT64 MVOL_fini_read();
FB_UINT64 MVOL_fini_write(int*, UCHAR**);
FB_UINT64 MVOL_fini_read();
FB_UINT64 MVOL_fini_write(int*, UCHAR**);
void MVOL_init(ULONG);
void MVOL_init_read(const char*, const char*, USHORT*, int*, UCHAR**);
void MVOL_init_write(const char*, const char*, int*, UCHAR**);

View File

@ -23,9 +23,6 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
*
* $Id: RecordNumber.h,v 1.5.4.3 2007-11-08 15:26:17 paulbeach Exp $
*
*/
#ifndef JRD_RECORDNUMBER_H

View File

@ -970,7 +970,7 @@ void dsc::address32bit() const
*
**************************************/
#if SIZEOF_VOID_P > 4
FB_UINT64 addr = (FB_UINT64)(IPTR)dsc_address;
FB_UINT64 addr = (FB_UINT64)(IPTR) dsc_address;
fb_assert(addr == (addr & 0xFFFFFFFF));
#endif
}

View File

@ -140,7 +140,7 @@ struct dsc
//bid asBlobId() const;
//bid asArrayId() const;
SINT64 asSBigInt() const;
FB_UINT64 asUBigInt() const;
FB_UINT64 asUBigInt() const;
};
typedef dsc DSC;

View File

@ -19,7 +19,6 @@
*
* All Rights Reserved.
* Contributor(s): ______________________________________.
* $Id: license.h,v 1.31.12.3 2007-11-08 15:26:17 paulbeach Exp $
* Revision 1.5 2000/12/08 16:18:21 fsg
* Preliminary changes to get IB_BUILD_NO automatically
* increased on commits.
@ -72,7 +71,7 @@
#define FB_PLATFORM "HU"
#endif /* HP10 */
#ifdef HP11
#define FB_PLATFORM "HU"
#define FB_PLATFORM "HU"
#endif /* HP11 */
#endif

View File

@ -328,7 +328,7 @@ static PAG db_read( SLONG page_number)
*
**************************************/
FB_UINT64 offset = ((FB_UINT64)page_number) * ((FB_UINT64)page_size);
FB_UINT64 offset = ((FB_UINT64) page_number) * ((FB_UINT64) page_size);
if (!global_buffer)
global_buffer = malloc(page_size);

View File

@ -20,14 +20,12 @@
* All Rights Reserved.
* Contributor(s): ______________________________________.
*
* $Id: drop.cpp,v 1.31.4.1 2007-11-08 15:26:26 paulbeach Exp $
*
* 2002.10.27 Sean Leyne - Completed removal of obsolete "DELTA" port
* 2002.10.27 Sean Leyne - Completed removal of obsolete "IMP" port
*
* 2002.10.29 Sean Leyne - Removed obsolete "Netware" port
*
*/
*/
#include "firebird.h"
#include <stdio.h>

View File

@ -1701,7 +1701,7 @@ static const pag* db_read( SLONG page_number)
}
page_number -= fil->fil_min_page - fil->fil_fudge;
const FB_UINT64 offset = ((FB_UINT64)page_number) * ((FB_UINT64)tddba->page_size);
const FB_UINT64 offset = ((FB_UINT64) page_number) * ((FB_UINT64) tddba->page_size);
if (lseek (fil->fil_desc, offset, 0) == -1) {
#ifdef SERVICE_THREAD
CMD_UTIL_put_svc_status(tddba->dba_service_blk->svc_status,