diff options
| author | Jose <jose@zeroc.com> | 2012-08-14 18:24:35 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-14 18:24:35 +0200 |
| commit | b267591b892a5b13669b68269616e218f74d3d28 (patch) | |
| tree | b02f45f63277fcc02ca0a6d9475a8d18b9fed89d /cpp/demo/IcePatch2/MFC/stdafx.h | |
| parent | minor: unused parameter (diff) | |
| download | ice-b267591b892a5b13669b68269616e218f74d3d28.tar.bz2 ice-b267591b892a5b13669b68269616e218f74d3d28.tar.xz ice-b267591b892a5b13669b68269616e218f74d3d28.zip | |
ICE-4808 - C++ Service don't use UNICODE version of various Windows API methods
Diffstat (limited to 'cpp/demo/IcePatch2/MFC/stdafx.h')
| -rwxr-xr-x | cpp/demo/IcePatch2/MFC/stdafx.h | 39 |
1 files changed, 10 insertions, 29 deletions
diff --git a/cpp/demo/IcePatch2/MFC/stdafx.h b/cpp/demo/IcePatch2/MFC/stdafx.h index 06b52e61d72..d9ba470f8fc 100755 --- a/cpp/demo/IcePatch2/MFC/stdafx.h +++ b/cpp/demo/IcePatch2/MFC/stdafx.h @@ -13,39 +13,20 @@ #pragma once -// -// For VC6 and STLport -// -#if !defined(NDEBUG) && !defined(_STLP_DEBUG) -# define _STLP_DEBUG -#endif - #ifndef VC_EXTRALEAN -#define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers +# define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers #endif -// Change this to the appropriate value to target Windows 98 and -// Windows 2000 or later if not using VC6. #ifndef _WIN32_WINNT -# if defined(_MSC_VER) && _MSC_VER < 1500 -# define _WIN32_WINNT 0x0400 -# endif +# define _WIN32_WINNT 0x0501 #endif #ifndef WINVER -# if defined(_MSC_VER) && _MSC_VER > 1300 && _MSC_VER < 1600 -# define WINVER 0x0400 -# elif defined(_MSC_VER) && _MSC_VER >=1600 - # define WINVER 0x0501 -# endif +# define WINVER 0x0501 #endif -#ifndef _WIN32_IE // Allow use of features specific to IE 4.0 or later. -# if defined(_MSC_VER) && _MSC_VER >=1600 -# define _WIN32_IE 0x0500 // Change this to the appropriate value to target IE 5.0 or later. -# else -# define _WIN32_IE 0x0400 -# endif +#ifndef _WIN32_IE // Allow use of features specific to IE 5.0 or later. +# define _WIN32_IE 0x0500 #endif #define _ATL_CSTRING_EXPLICIT_CONSTRUCTORS // some CString constructors will be explicit @@ -53,12 +34,12 @@ // turns off MFC's hiding of some common and often safely ignored warning messages #define _AFX_ALL_WARNINGS -#include <afxwin.h> // MFC core and standard components -#include <afxext.h> // MFC extensions +#include <afxwin.h> // MFC core and standard components +#include <afxext.h> // MFC extensions -#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls +#include <afxdtctl.h> // MFC support for Internet Explorer 4 Common Controls #ifndef _AFX_NO_AFXCMN_SUPPORT -#include <afxcmn.h> // MFC support for Windows Common Controls -#endif // _AFX_NO_AFXCMN_SUPPORT +# include <afxcmn.h> // MFC support for Windows Common Controls +#endif #include <Ice/Ice.h> |