diff options
| author | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-25 08:19:38 +0000 |
|---|---|---|
| committer | jtc <jtc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2005-03-25 08:19:38 +0000 |
| commit | 0583b10d3a84c2e3eb6945f77d130ca660221694 (patch) | |
| tree | 9da59e7c12413bcd4ccb87e77613af4834b997ec | |
| parent | 41649d980e8bee72ef0eee3b8e2f0000acd5a347 (diff) | |
| download | ATCD-0583b10d3a84c2e3eb6945f77d130ca660221694.tar.gz | |
ChangeLogTag: Thu Mar 24 23:42:34 2005 J.T. Conklin <jtc@acorntoolworks.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ace/Basic_Types.h | 9 |
2 files changed, 18 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 83be843b26b..bd3cae873e2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Thu Mar 24 23:42:34 2005 J.T. Conklin <jtc@acorntoolworks.com> + + * ace/Basic_Types.h: + + Fix typo in ACE_SIZEOF_LONG_LONG definition for systems with + ACE_LACKS_LONG_LONG set. + + Set ACE_SIZEOF_LONG_LONG to 8 if we can't figure out what to set + it to from ULLONG_MAX or ULONGLONG_MAX, which may not be present + or may need special contortions to be defined. + Thu Mar 24 12:27:05 2005 J.T. Conklin <jtc@acorntoolworks.com> * ace/README: diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 83d7b8f591a..75d4150b376 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -144,7 +144,7 @@ // The number of bytes in a long long. # if !defined (ACE_SIZEOF_LONG_LONG) # if defined (ACE_LACKS_LONGLONG_T) -# define ACE_SIZEOF_LONG_LONG +# define ACE_SIZEOF_LONG_LONG 8 # elif defined (ULLONG_MAX) # if ((ULLONG_MAX) == 4294967295ULL) # define ACE_SIZEOF_LONG_LONG 4 @@ -158,8 +158,13 @@ # define ACE_SIZEOF_LONG_LONG 8 # endif # endif +# // If we can't determine the size of long long, assume it is 8 +# // instead of erroring out. (Either ULLONG_MAX and ULONGLONG_MAX +# // may not be supported; or an extended C/C++ dialect may need to +# // be selected. If this assumption is wrong, it can be addressed +# // in the platform-specific config header. # if !defined (ACE_SIZEOF_LONG_LONG) -# error: unsupported long long size, must be updated for this platform! +# define ACE_SIZEOF_LONG_LONG 8 # endif # endif /* !defined (ACE_SIZEOF_LONG_LONG) */ |