diff -urN globus_2_4_3/common/source/dirt.sh globus_2_4_3_adv2003/common/source/dirt.sh --- globus_2_4_3/common/source/dirt.sh Wed Sep 3 18:34:45 2003 +++ globus_2_4_3_adv2003/common/source/dirt.sh Fri Dec 12 19:03:09 2003 @@ -1,2 +1,2 @@ -DIRT_TIMESTAMP=1062606885 +DIRT_TIMESTAMP=1071252189 DIRT_BRANCH_ID=42 diff -urN globus_2_4_3/common/source/library/globus_debug.h globus_2_4_3_adv2003/common/source/library/globus_debug.h --- globus_2_4_3/common/source/library/globus_debug.h Thu Feb 13 06:43:18 2003 +++ globus_2_4_3_adv2003/common/source/library/globus_debug.h Fri Sep 26 23:04:37 2003 @@ -4,6 +4,18 @@ #include "globus_common_include.h" +#ifndef EXTERN_C_BEGIN +#ifdef __cplusplus +#define EXTERN_C_BEGIN extern "C" { +#define EXTERN_C_END } +#else +#define EXTERN_C_BEGIN +#define EXTERN_C_END +#endif +#endif + +EXTERN_C_BEGIN + #ifdef BUILD_DEBUG void diff -urN globus_2_4_3/common/source/library/globus_memory.c globus_2_4_3_adv2003/common/source/library/globus_memory.c --- globus_2_4_3/common/source/library/globus_memory.c Thu Oct 24 05:14:20 2002 +++ globus_2_4_3_adv2003/common/source/library/globus_memory.c Fri Dec 12 18:37:04 2003 @@ -8,8 +8,8 @@ CVS Information: $Source: /home/globdev/CVS/globus-packages/common/source/library/globus_memory.c,v $ - $Date: 2002/10/24 03:14:20 $ - $Revision: 1.10 $ + $Date: 2003/12/12 17:37:04 $ + $Revision: 1.10.8.2 $ $State: Exp $ $Author: link $ ******************************************************************************/ @@ -77,7 +77,7 @@ int pad; struct globus_memory_s * s_mem_info; - pad = I_ALIGN_SIZE - (node_size % I_ALIGN_SIZE); + pad = (I_ALIGN_SIZE - (node_size % I_ALIGN_SIZE)) % I_ALIGN_SIZE; assert(mem_info != GLOBUS_NULL); s_mem_info = (struct globus_memory_s *)globus_malloc(sizeof(struct globus_memory_s)); @@ -246,7 +246,8 @@ } } globus_mutex_unlock(&s_mem_info->lock); - + + globus_free(s_mem_info->free_ptrs); globus_mutex_destroy(&s_mem_info->lock); globus_free(s_mem_info); *mem_info = GLOBUS_NULL; @@ -310,6 +311,7 @@ globus_memory_destroy( globus_memory_t * mem_info) { + globus_free(*mem_info); return GLOBUS_TRUE; } diff -urN globus_2_4_3/common/source/pkgdata/pkg_data_src.gpt.in globus_2_4_3_adv2003/common/source/pkgdata/pkg_data_src.gpt.in --- globus_2_4_3/common/source/pkgdata/pkg_data_src.gpt.in Wed Sep 3 18:34:45 2003 +++ globus_2_4_3_adv2003/common/source/pkgdata/pkg_data_src.gpt.in Fri Dec 12 19:03:09 2003 @@ -3,7 +3,7 @@ - + Common Library Common