diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-15 19:19:11 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1997-07-15 19:19:11 +0000 |
| commit | 101de37c2f1b017f7384d291accd0cedd2a5fa0f (patch) | |
| tree | 93cb57d24807ecd43ebadf9661f0762040cb561d /ace/config-win32-common.h | |
| parent | 86b2b82f8a5d16fe8f1d2f255c6a0e416851f899 (diff) | |
| download | ATCD-101de37c2f1b017f7384d291accd0cedd2a5fa0f.tar.gz | |
*** empty log message ***
Diffstat (limited to 'ace/config-win32-common.h')
| -rw-r--r-- | ace/config-win32-common.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index 3b5b543e3fd..ae6830d55e8 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -211,7 +211,7 @@ #endif // We are build ACE and want to use MFC (multithreaded) -#if defined(ACE_BUILD_DLL) && defined(ACE_HAS_MFC) && defined (_MT) +#if defined(ACE_HAS_DLL) && defined(ACE_BUILD_DLL) && defined(ACE_HAS_MFC) && defined (_MT) #if !defined (_AFXDLL) // force multithreaded MFC DLL #define _AFXDLL @@ -234,7 +234,8 @@ // This is necessary since MFC users apparently can't #include // <windows.h> directly. -#if defined (_AFXDLL) || defined (_WINDLL) || ( defined(ACE_BUILD_DLL) && defined(ACE_HAS_MFC)) +#if defined (_AFXDLL) || defined (_WINDLL) || + ( defined(ACE_HAS_DLL) && defined(ACE_BUILD_DLL) && defined(ACE_HAS_MFC)) #include /**/ <afxwin.h> /* He is doing MFC */ // Windows.h will be included via afxwin.h->afx.h->afx_ver_.h->afxv_w32.h // #define _INC_WINDOWS // Prevent winsock.h from including windows.h |