summaryrefslogtreecommitdiff
path: root/ACE/ace/Basic_Types.h
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2008-10-02 16:45:57 +0000
committerSteve Huston <shuston@riverace.com>2008-10-02 16:45:57 +0000
commitd5557c9397f08780775ab47e7f936eab97c04724 (patch)
treebbc33bbd3901a214e058e1e06f7c05be757f1d21 /ACE/ace/Basic_Types.h
parent028e6354140364184e68cb9d5f3950fd3afb64d9 (diff)
downloadATCD-d5557c9397f08780775ab47e7f936eab97c04724.tar.gz
ChangeLogTag:Thu Oct 2 16:41:57 UTC 2008 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/Basic_Types.h')
-rw-r--r--ACE/ace/Basic_Types.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h
index 2d6942bb511..b30d68a56be 100644
--- a/ACE/ace/Basic_Types.h
+++ b/ACE/ace/Basic_Types.h
@@ -391,10 +391,13 @@ ACE_END_VERSIONED_NAMESPACE_DECL
# endif /* __BYTE_ORDER */
# else /* ! BYTE_ORDER && ! __BYTE_ORDER */
// We weren't explicitly told, so we have to figure it out . . .
+ // Note that Itanium hardware (IA64) can run in either byte order. It's
+ // selected by the OS when loading; Windows runs little, HP-UX runs big.
# if defined (i386) || defined (__i386__) || defined (_M_IX86) || \
defined (vax) || defined (__alpha) || defined (__LITTLE_ENDIAN__) || \
- defined (ARM) || defined (_M_IA64) || defined (__ia64__) || \
- defined (_M_AMD64) || defined (__amd64)
+ defined (ARM) || defined (_M_IA64) || defined (_M_AMD64) || \
+ defined (__amd64) || \
+ ((defined (__ia64__) || defined (__ia64)) && !defined (__hpux))
// We know these are little endian.
# define ACE_LITTLE_ENDIAN 0x0123
# define ACE_BYTE_ORDER ACE_LITTLE_ENDIAN