INTEGRATION: CWS sb59 (1.2.64); FILE MERGED
2006/09/29 13:47:31 sb 1.2.64.2: Manually merged in 1.3 (from SRC680m186). 2006/08/29 14:08:21 sb 1.2.64.1: #i67487# Made code warning-free (wntmsci10).
This commit is contained in:
parent
b581120b6a
commit
8e9c0ba1d3
1 changed files with 9 additions and 2 deletions
|
@ -4,9 +4,9 @@
|
||||||
*
|
*
|
||||||
* $RCSfile: platform.h,v $
|
* $RCSfile: platform.h,v $
|
||||||
*
|
*
|
||||||
* $Revision: 1.3 $
|
* $Revision: 1.4 $
|
||||||
*
|
*
|
||||||
* last change: $Author: vg $ $Date: 2006-09-25 13:02:05 $
|
* last change: $Author: obo $ $Date: 2006-10-12 14:09:05 $
|
||||||
*
|
*
|
||||||
* The Contents of this file are made available subject to
|
* The Contents of this file are made available subject to
|
||||||
* the terms of GNU Lesser General Public License Version 2.1.
|
* the terms of GNU Lesser General Public License Version 2.1.
|
||||||
|
@ -42,12 +42,19 @@
|
||||||
#endif
|
#endif
|
||||||
#define _ATL_APARTMENT_THREADED
|
#define _ATL_APARTMENT_THREADED
|
||||||
|
|
||||||
|
#if defined _MSC_VER
|
||||||
|
#pragma warning(push, 1)
|
||||||
|
#pragma warning(disable: 4548 4917)
|
||||||
|
#endif
|
||||||
#include "windows.h"
|
#include "windows.h"
|
||||||
#if defined(_MSC_VER) && (_MSC_VER > 1310)
|
#if defined(_MSC_VER) && (_MSC_VER > 1310)
|
||||||
#include <atldbcli.h>
|
#include <atldbcli.h>
|
||||||
#else
|
#else
|
||||||
#include "atlcomcli.h"
|
#include "atlcomcli.h"
|
||||||
#endif
|
#endif
|
||||||
|
#if defined _MSC_VER
|
||||||
|
#pragma warning(pop)
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue