diff options
Diffstat (limited to 'TAO/tao/encode.cpp')
| -rw-r--r-- | TAO/tao/encode.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/TAO/tao/encode.cpp b/TAO/tao/encode.cpp index a1f825e3a37..cc826240eb4 100644 --- a/TAO/tao/encode.cpp +++ b/TAO/tao/encode.cpp @@ -316,10 +316,8 @@ TAO_Marshal_Struct::encode (CORBA::TypeCode_ptr tc, alignment = param->alignment (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - // MSVC built code works with either of these, but Borland - // Builder needs the first one, whereas Sun compilers - // need the second one. -#if defined (WIN32) + // Borland Builder aligns things a little differently. +#if defined (__BORLANDC__) align_offset = (ptr_arith_t) ptr_align_binary (data, alignment) - (ptr_arith_t) data |