diff --git a/ase/pack.h b/ase/pack.h index 05622e49..ad2a2e7c 100644 --- a/ase/pack.h +++ b/ase/pack.h @@ -1,13 +1,15 @@ /* - * $Id: pack.h,v 1.3 2007-02-18 16:49:03 bacon Exp $ + * $Id: pack.h,v 1.4 2007-02-19 06:13:03 bacon Exp $ * * {License} */ #if defined(__GNUC__) -#pragma pack(push,1) + #pragma pack(push,1) #elif defined(__HP_aCC) || defined(__HP_cc) -#pragma PACK 1 + #pragma PACK 1 #elif defined(_MSC_VER) || defined(__BORLANDC__) -#pragma pack(push,1) + #pragma pack(push,1) +#elif defined(__DECC) + #pragma pack(push,1) #endif diff --git a/ase/unpack.h b/ase/unpack.h index b5d21eb9..6a694e54 100644 --- a/ase/unpack.h +++ b/ase/unpack.h @@ -1,13 +1,15 @@ /* - * $Id: unpack.h,v 1.3 2007-02-18 16:49:03 bacon Exp $ + * $Id: unpack.h,v 1.4 2007-02-19 06:13:03 bacon Exp $ * * {License} */ #if defined(__GNUC__) -#pragma pack(pop) + #pragma pack(pop) #elif defined(__HP_aCC) || defined(__HP_cc) -#pragma PACK + #pragma PACK #elif defined(__MSC_VER) || defined(__BORLANDC__) -#pragma pack(pop) + #pragma pack(pop) +#elif defined(__DECC) + #pragma pack(pop) #endif diff --git a/ase/utl/main.c b/ase/utl/main.c index 9e09c5e9..88ef7e98 100644 --- a/ase/utl/main.c +++ b/ase/utl/main.c @@ -1,5 +1,5 @@ /* - * $Id: main.c,v 1.8 2007-02-03 10:52:36 bacon Exp $ + * $Id: main.c,v 1.9 2007-02-19 06:13:03 bacon Exp $ * * {License} */ @@ -68,8 +68,11 @@ int main (int argc, char* argv[]/*, char** envp*/) p += x; rem -= x; len++; } - v[i] = (ase_char_t*) malloc ( - (len + 1) * ASE_SIZEOF(ase_char_t)); + #if (defined(vms) || defined(__vms)) && (ASE_SIZEOF_VOID_P >= 8) + v[i] = (ase_char_t*) _malloc32 ((len+1)*ASE_SIZEOF(ase_char_t)); + #else + v[i] = (ase_char_t*) malloc ((len+1)*ASE_SIZEOF(ase_char_t)); + #endif if (v[i] == NULL) { ret = -1; diff --git a/ase/utl/printf.c b/ase/utl/printf.c index f16750aa..1512fe74 100644 --- a/ase/utl/printf.c +++ b/ase/utl/printf.c @@ -1,5 +1,5 @@ /* - * $Id: printf.c,v 1.10 2007-02-07 05:43:37 bacon Exp $ + * $Id: printf.c,v 1.11 2007-02-19 06:13:03 bacon Exp $ * * {License} */ @@ -172,7 +172,11 @@ static ase_char_t* __adjust_format (const ase_char_t* format) buf.len = 0; buf.cap = 256; +#if (defined(vms) || defined(__vms)) && (ASE_SIZEOF_VOID_P >= 8) + buf.ptr = (ase_char_t*) _malloc32 (sizeof(ase_char_t)*(buf.cap+1)); +#else buf.ptr = (ase_char_t*) malloc (sizeof(ase_char_t)*(buf.cap+1)); +#endif if (buf.ptr == NULL) return NULL; while (*fp != ASE_T('\0'))