diff options
-rw-r--r-- | ACE/ChangeLog | 9 | ||||
-rw-r--r-- | ACE/m4/platform.m4 | 15 |
2 files changed, 22 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 6a93923b332..47ea3adbf89 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Fri May 23 14:20:48 UTC 2008 J.T. Conklin <jtc@acorntoolworks.com> + + * m4/platform.m4: + + Added *mingw64* case in ACE_SET_PLATFORM_MACROS and + ACE_CHECK_FORMAT_SPECIFIERS feature test macros. + Fri May 23 12:45:00 UTC 2008 Simon Massey <sma at prismtech dot com> * ace/RB_Tree.cpp: @@ -8,7 +15,7 @@ Fri May 23 12:45:00 UTC 2008 Simon Massey <sma at prismtech dot com> Fri May 23 12:14:54 UTC 2008 Jeff Parsons <j.parsons@vanderbilt.edu> * ace/Monitor_Control/Auto_Update_Starter.h: - + Updated filename (which was recently changed) in a comment. Thanks to Simon Massey <simon.massey@prismtech.com> for reporting the fuzz warning. diff --git a/ACE/m4/platform.m4 b/ACE/m4/platform.m4 index cdab216495d..313017c8cd0 100644 --- a/ACE/m4/platform.m4 +++ b/ACE/m4/platform.m4 @@ -281,9 +281,11 @@ dnl Check for _POSIX_C_SOURCE macro *cygwin32*) AC_DEFINE([CYGWIN32]) ;; + *mingw32*) + AC_DEFINE([ACE_WIN32]) + ;; *win32*) AC_DEFINE([ACE_WIN32]) - AC_DEFINE([ACE_UINT64_FORMAT_SPECIFIER], ["%I64u"]) dnl AC_DEFINE(ACE_USE_SELECT_REACTOR_FOR_REACTOR_IMPL) if test "$ace_u_long_long_typedef_set" != yes; then ACE_UINT64="unsigned __int64" @@ -352,6 +354,7 @@ linux*) alpha|ia64|x86_64) AC_DEFINE([ACE_SIZE_T_FORMAT_SPECIFIER], ["%lu"]) AC_DEFINE([ACE_SSIZE_T_FORMAT_SPECIFIER], ["%ld"]) + AC_DEFINE([ACE_INT64_FORMAT_SPECIFIER], ["%ld"]) AC_DEFINE([ACE_UINT64_FORMAT_SPECIFIER], ["%lu"]) ;; *) @@ -359,6 +362,11 @@ linux*) esac ;; +mingw32*) + AC_DEFINE([ACE_INT64_FORMAT_SPECIFIER], ["%I64d"]) + AC_DEFINE([ACE_UINT64_FORMAT_SPECIFIER], ["%I64u"]) + ;; + netbsd*) case "$host_cpu" in x86_64) @@ -370,6 +378,11 @@ netbsd*) esac ;; +win32*) + AC_DEFINE([ACE_INT64_FORMAT_SPECIFIER], ["%I64d"]) + AC_DEFINE([ACE_UINT64_FORMAT_SPECIFIER], ["%I64u"]) + ;; + *) ;; esac]) |