diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-10 12:54:30 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-10-10 12:54:30 +0000 |
| commit | cb8c9fb9d2fd5dbf93e21e0fbeceb829e1f0e52b (patch) | |
| tree | db5330ad42c29c632164a0bf7522cf123cd09547 | |
| parent | e19115cbe5d6d3f2988c1d8320c0fab6647956f8 (diff) | |
| download | ATCD-cb8c9fb9d2fd5dbf93e21e0fbeceb829e1f0e52b.tar.gz | |
Tue Oct 10 12:54:00 UTC 2006 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 6 | ||||
| -rw-r--r-- | ACE/ace/config-win32-msvc.h | 10 |
2 files changed, 7 insertions, 9 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 8566de97283..5f0a2a4d122 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,9 @@ +Tue Oct 10 12:54:00 UTC 2006 Simon Massey <sma@prismtech.com> + + * ace/config-win32-msvc.h: + Changed the MFC build run-time dll decorators to match + the current build system settings. + Tue Oct 10 06:08:12 2006 Johnny Willemsen <jwillemsen@remedy.nl> * bin/fuzz.pl: diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h index 3934406683a..9b85888b05b 100644 --- a/ACE/ace/config-win32-msvc.h +++ b/ACE/ace/config-win32-msvc.h @@ -31,15 +31,7 @@ #if !defined (ACE_LD_DECORATOR_STR) # if defined (_DEBUG) -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfcd") -# else -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") -# endif /* ACE_HAS_MFC */ -# else /* _NDEBUG */ -# if ACE_HAS_MFC == 1 -# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("mfc") -# endif /* ACE_HAS_MFC */ +# define ACE_LD_DECORATOR_STR ACE_LIB_TEXT ("d") # endif /* _DEBUG */ #endif /* ACE_LD_DECORATOR_STR */ |