From: Alexander P. <ale...@us...> - 2008-11-05 11:26:27
|
Build Version : T2.5.0.21307 Firebird 2.5 Alpha 1 (writeBuildNum.sh,v 1.21468 2008/11/05 11:26:23 alexpeshkof ) Update of /cvsroot/firebird/firebird2/src/lock In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv22848/src/lock Modified Files: lock.cpp Log Message: AIX port - use FB_ prefix for alignment constants Index: lock.cpp =================================================================== RCS file: /cvsroot/firebird/firebird2/src/lock/lock.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -b -U3 -r1.169 -r1.170 --- lock.cpp 24 Oct 2008 04:49:15 -0000 1.169 +++ lock.cpp 5 Nov 2008 11:26:20 -0000 1.170 @@ -1115,7 +1115,7 @@ * Allocate a block of given size. * **************************************/ - size = FB_ALIGN(size, ALIGNMENT); + size = FB_ALIGN(size, FB_ALIGNMENT); ASSERT_ACQUIRED; const ULONG block = m_header->lhb_used; m_header->lhb_used += size; @@ -2244,7 +2244,7 @@ sizeof(lhb) + (m_header->lhb_hash_slots * sizeof(m_header->lhb_hash[0])); m_header->lhb_length = shmem_data->sh_mem_length_mapped; - m_header->lhb_used = FB_ALIGN(length, ALIGNMENT); + m_header->lhb_used = FB_ALIGN(length, FB_ALIGNMENT); shb* secondary_header = (shb*) alloc(sizeof(shb), NULL); if (!secondary_header) |