diff options
| author | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-08-16 21:54:10 +0200 |
| commit | 0333544ca90a99baa6e9dc7373eba744d4404970 (patch) | |
| tree | b8d204864002edf7d0bbe903a8bf1fc8c917c8ee /cpp/demo/Ice/MFC/client/stdafx.h | |
| parent | minor fixes (diff) | |
| parent | IceGridGUI updates to use latest jgoodies packages (diff) | |
| download | ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.bz2 ice-0333544ca90a99baa6e9dc7373eba744d4404970.tar.xz ice-0333544ca90a99baa6e9dc7373eba744d4404970.zip | |
Merge remote-tracking branch 'origin/encoding11' into mx
Conflicts:
cpp/config/Make.rules.Darwin
cpp/src/Ice/ConnectionFactory.cpp
cpp/src/Ice/ConnectionI.h
Diffstat (limited to 'cpp/demo/Ice/MFC/client/stdafx.h')
| -rwxr-xr-x | cpp/demo/Ice/MFC/client/stdafx.h | 38 |
1 files changed, 9 insertions, 29 deletions
diff --git a/cpp/demo/Ice/MFC/client/stdafx.h b/cpp/demo/Ice/MFC/client/stdafx.h index 06b52e61d72..c7ab72d2085 100755 --- a/cpp/demo/Ice/MFC/client/stdafx.h +++ b/cpp/demo/Ice/MFC/client/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,11 @@ // 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 #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> |