ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-26 05:50:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'removewindowsheader2' into 'master'

Browse Source 
Remove windows.h include where possible.

See merge request ngsolve/netgen!629
This commit is contained in:
Hochsteger, Matthias 2024-02-12 11:57:54 +01:00
commit 482bcb83d5
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libsrc/include/incopengl.hpp
View File

@ -5,6 +5,10 @@
#include <mystdlib.h> #include <mystdlib.h>
#include <mydefs.hpp> #include <mydefs.hpp>
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
# ifdef __APPLE__ # ifdef __APPLE__
#define GL_SILENCE_DEPRECATION #define GL_SILENCE_DEPRECATION

5
libsrc/include/inctcl.hpp
View File

@ -1,3 +1,8 @@
#ifdef WIN32
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
#include <tcl.h> #include <tcl.h>
#include <tk.h> #include <tk.h>

2
libsrc/include/mystdlib.h
View File

@ -59,7 +59,7 @@ namespace metis { extern "C" {
// # include <afxmt.h> // # include <afxmt.h>
# endif // MSVC_EXPRESS # endif // MSVC_EXPRESS
# endif # endif
# include <windows.h> // # include <windows.h>
# undef WIN32_LEAN_AND_MEAN # undef WIN32_LEAN_AND_MEAN
// # include <winnt.h> // # include <winnt.h>
#else // Not using MC VC++ #else // Not using MC VC++

7
libsrc/meshing/meshing.hpp
View File

@ -9,13 +9,6 @@
#include "../include/opti.hpp" #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 namespace netgen
{ {
// extern int printmessage_importance; // extern int printmessage_importance;