INTEGRATION: CWS mingwport06 (1.5.48); FILE MERGED

2007/08/24 13:12:57 vg 1.5.48.1: #i75499# pragma is for MSVC
This commit is contained in:
Kurt Zenker 2007-09-06 12:32:01 +00:00
parent 968ab99ae4
commit 7754f31800

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: registrywnt.cxx,v $ * $RCSfile: registrywnt.cxx,v $
* *
* $Revision: 1.5 $ * $Revision: 1.6 $
* *
* last change: $Author: vg $ $Date: 2007-03-26 14:10:21 $ * last change: $Author: kz $ $Date: 2007-09-06 13:32:01 $
* *
* 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.
@ -37,9 +37,13 @@
// //
//--------------------------------------- //---------------------------------------
#ifdef _MSC_VER
#pragma warning(push, 1) /* disable warnings within system headers */ #pragma warning(push, 1) /* disable warnings within system headers */
#endif
#include <windows.h> #include <windows.h>
#ifdef _MSC_VER
#pragma warning(pop) #pragma warning(pop)
#endif
#include <malloc.h> #include <malloc.h>
@ -57,7 +61,9 @@
#include <assert.h> #include <assert.h>
#ifdef _MSC_VER
#pragma warning(disable : 4786 4350) #pragma warning(disable : 4786 4350)
#endif
//--------------------------------------- //---------------------------------------
// //