mirror of
https://github.com/NGSolve/netgen.git
synced 2024-11-11 16:49:16 +05:00
Merge branch 'removewindowsheader2' into 'master'
Remove windows.h include where possible. See merge request ngsolve/netgen!629
This commit is contained in:
commit
482bcb83d5
@ -5,6 +5,10 @@
|
||||
#include <mystdlib.h>
|
||||
#include <mydefs.hpp>
|
||||
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
# ifdef __APPLE__
|
||||
#define GL_SILENCE_DEPRECATION
|
||||
|
@ -1,3 +1,8 @@
|
||||
#ifdef WIN32
|
||||
#define WIN32_LEAN_AND_MEAN
|
||||
#include <windows.h>
|
||||
#endif
|
||||
|
||||
#include <tcl.h>
|
||||
#include <tk.h>
|
||||
|
||||
|
@ -59,7 +59,7 @@ namespace metis { extern "C" {
|
||||
// # include <afxmt.h>
|
||||
# endif // MSVC_EXPRESS
|
||||
# endif
|
||||
# include <windows.h>
|
||||
// # include <windows.h>
|
||||
# undef WIN32_LEAN_AND_MEAN
|
||||
// # include <winnt.h>
|
||||
#else // Not using MC VC++
|
||||
|
@ -9,13 +9,6 @@
|
||||
#include "../include/opti.hpp"
|
||||
|
||||
|
||||
/*** Windows headers ***/
|
||||
#ifdef _MSC_VER
|
||||
# define WIN32_LEAN_AND_MEAN
|
||||
# include <windows.h>
|
||||
# undef WIN32_LEAN_AND_MEAN
|
||||
#endif
|
||||
|
||||
namespace netgen
|
||||
{
|
||||
// extern int printmessage_importance;
|
||||
|
Loading…
Reference in New Issue
Block a user