strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS mingwport06 (1.5.90); FILE MERGED

Browse source 
2007/08/24 13:12:57 vg 1.5.90.1: #i75499# pragma is for MSVC
This commit is contained in:
Kurt Zenker 2007-09-06 12:29:29 +00:00
parent 0140c3cf86
commit f437b3fea2
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
setup_native/source/win32/customactions/reg4msdoc/register.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: register.cxx,v $ * $RCSfile: register.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: vg $ $Date: 2006-09-25 13:06:05 $ * last change: $Author: kz $ $Date: 2007-09-06 13:29:29 $
* *
* 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.
@ -61,14 +61,20 @@
#include "msihelper.hxx" #include "msihelper.hxx"
#endif #endif
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */ #pragma warning(push, 1) /* disable warnings within system headers */
#pragma warning(disable: 4917) #pragma warning(disable: 4917)
#endif
#include <shlobj.h> #include <shlobj.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif
#include <assert.h> #include <assert.h>
#ifdef _MSC_VER
#pragma warning(disable: 4350) #pragma warning(disable: 4350)
#endif
typedef std::auto_ptr<Registrar> RegistrarPtr; typedef std::auto_ptr<Registrar> RegistrarPtr;