diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-07 05:08:02 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-07 05:08:02 +0000 |
| commit | 35825ef517ff8210b5be047aceba04c7107fb731 (patch) | |
| tree | 993712f5a596b1f2aa940c1eb5077b46b397fa64 /ace | |
| parent | f5621cf857ac6e2756ce1688f5291fa4ecc788f1 (diff) | |
| download | ATCD-35825ef517ff8210b5be047aceba04c7107fb731.tar.gz | |
moved ACE_UINT64_FORMAT_SPECIFIER from OS.h to Basic_Types.h
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Basic_Types.h | 4 | ||||
| -rw-r--r-- | ace/OS.h | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/ace/Basic_Types.h b/ace/Basic_Types.h index 87dabdf9d42..e02f1692a69 100644 --- a/ace/Basic_Types.h +++ b/ace/Basic_Types.h @@ -304,6 +304,10 @@ typedef ACE_UINT16 ACE_USHORT16; # define ACE_UINT64_LITERAL(n) n ## ull # endif /* ! ACE_WIN32 */ +#if !defined (ACE_UINT64_FORMAT_SPECIFIER) +# define ACE_UINT64_FORMAT_SPECIFIER "%llu" +#endif /* ACE_UINT64_FORMAT_SPECIFIER */ + // Cast from UINT64 to a double requires an intermediate cast to INT64 // on some platforms. # if defined (ACE_WIN32) @@ -26,11 +26,6 @@ # pragma once # endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_UINT64_FORMAT_SPECIFIER) -// At least for Win32 - MSVC compiler (ver. 5) -#define ACE_UINT64_FORMAT_SPECIFIER "%I64u" -#endif /* ACE_UINT64_FORMAT_SPECIFIER */ - // Get OS.h to compile on some of the platforms without DIR info yet. # if !defined (ACE_HAS_DIRENT) typedef int DIR; @@ -5876,7 +5871,7 @@ private: # else // I know this works for HP aC++... if <stdexcept> is used, it // introduces other stuff that breaks things, like <memory>, which - // screws up auto_ptr. + // screws up auto_ptr. # include /**/ <new> # define ACE_bad_alloc bad_alloc # endif /* __SUNPRO_CC */ |