INTEGRATION: CWS bunoexttm (1.9.14); FILE MERGED
2007/02/12 10:19:49 kr 1.9.14.1: adapted: need to put Environment::invoke into no_warn
This commit is contained in:
parent
2fc0df0b50
commit
888c472b22
1 changed files with 7 additions and 6 deletions
|
@ -4,9 +4,9 @@
|
|||
*
|
||||
* $RCSfile: native_bootstrap.cxx,v $
|
||||
*
|
||||
* $Revision: 1.9 $
|
||||
* $Revision: 1.10 $
|
||||
*
|
||||
* last change: $Author: obo $ $Date: 2006-09-17 01:52:08 $
|
||||
* last change: $Author: kz $ $Date: 2007-05-09 13:30:02 $
|
||||
*
|
||||
* The Contents of this file are made available subject to
|
||||
* the terms of GNU Lesser General Public License Version 2.1.
|
||||
|
@ -36,15 +36,16 @@
|
|||
// MARKER(update_precomp.py): autogen include statement, do not remove
|
||||
#include "precompiled_cli_ure.hxx"
|
||||
|
||||
#pragma warning(push, 1)
|
||||
#include <windows.h>
|
||||
#include "uno/environment.hxx"
|
||||
#pragma warning(pop)
|
||||
|
||||
#include "native_share.h"
|
||||
|
||||
#include "rtl/bootstrap.hxx"
|
||||
#include "cppuhelper/bootstrap.hxx"
|
||||
|
||||
#pragma warning(push, 1)
|
||||
#include <windows.h>
|
||||
#pragma warning(pop)
|
||||
|
||||
#include <delayimp.h>
|
||||
#include <stdio.h>
|
||||
|
||||
|
|
Loading…
Reference in a new issue