Skip to content
Snippets Groups Projects
Commit 76649c31 authored by Anthony Royer's avatar Anthony Royer
Browse files

Merge branch 'psapi' into 'master' 

psapi.h must be included after windows.h

See merge request !25
parents 5271f5a3 6d558448
No related branches found
No related tags found
1 merge request!25psapi.h must be included after windows.h
Pipeline #10173 passed
Stage: gmshfem
Stage: build
Stage: test
Show whitespace changes
Inline Side-by-side
src/common/resources.cpp
+ 1
− 1
View file @ 76649c31
...@@ -6,8 +6,8 @@ ...@@ -6,8 +6,8 @@
#include <cstdio> #include <cstdio>
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
#include <psapi.h>
#include <windows.h> #include <windows.h>
#include <psapi.h>
#endif #endif
#if !defined(WIN32) || defined(__CYGWIN__) #if !defined(WIN32) || defined(__CYGWIN__)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment