diff options
Diffstat (limited to 'ace/config-win32-common.h')
| -rw-r--r-- | ace/config-win32-common.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ace/config-win32-common.h b/ace/config-win32-common.h index ddfc4a3b77b..1519f7f50ab 100644 --- a/ace/config-win32-common.h +++ b/ace/config-win32-common.h @@ -284,6 +284,11 @@ typedef unsigned __int64 ACE_UINT64; #endif /* _UNICODE */ #endif /* UNICODE */ +// If __ACE_INLINE__ is defined to be 0, we will undefine it +#if defined (__ACE_INLINE__) && (__ACE_INLINE__ == 0) + #undef __ACE_INLINE__ +#endif /* __ACE_INLINE__ */ + #ifdef _DEBUG #if !defined (ACE_HAS_WINCE) #include /**/ <crtdbg.h> @@ -292,15 +297,10 @@ typedef unsigned __int64 ACE_UINT64; // If we are making a release, and the user has not specified // inline directives, we will default to inline #if ! defined (__ACE_INLINE__) - #define __ACE_INLINE__ 1 + #define __ACE_INLINE__ #endif /* __ACE_INLINE__ */ #endif -// If __ACE_INLINE__ is defined to be 0, we will undefine it -#if defined (__ACE_INLINE__) && (__ACE_INLINE__ == 0) - #undef __ACE_INLINE__ -#endif /* __ACE_INLINE__ */ - // We are build ACE and want to use MFC (multithreaded) #if defined(ACE_HAS_MFC) && (ACE_HAS_MFC != 0) && defined (_MT) #if (ACE_HAS_DLL != 0) && defined(ACE_BUILD_DLL) && !defined (_WINDLL) @@ -333,8 +333,8 @@ typedef unsigned __int64 ACE_UINT64; // 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 #elif defined (ACE_HAS_WINCE) - #include /**/ <windows.h> - #include /**/ <wce.h> + #include <windows.h> + #include <wce.h> #endif #if !defined (_INC_WINDOWS) /* Already include windows.h ? */ |