aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/dlfcn.cc1
-rw-r--r--winsup/cygwin/resource.cc1
-rw-r--r--winsup/utils/dumper.cc1
-rw-r--r--winsup/utils/ldd.cc2
-rw-r--r--winsup/utils/mingw/bloda.cc1
-rw-r--r--winsup/utils/module_info.cc1
-rw-r--r--winsup/utils/pldd.c1
-rw-r--r--winsup/utils/ps.cc1
8 files changed, 5 insertions, 4 deletions
diff --git a/winsup/cygwin/dlfcn.cc b/winsup/cygwin/dlfcn.cc
index c675a57..9a74728 100644
--- a/winsup/cygwin/dlfcn.cc
+++ b/winsup/cygwin/dlfcn.cc
@@ -7,7 +7,6 @@ Cygwin license. Please consult the file "CYGWIN_LICENSE" for
details. */
#include "winsup.h"
-#include <psapi.h>
#include <stdlib.h>
#include <dlfcn.h>
#include <ctype.h>
diff --git a/winsup/cygwin/resource.cc b/winsup/cygwin/resource.cc
index 97777e9..1664bca 100644
--- a/winsup/cygwin/resource.cc
+++ b/winsup/cygwin/resource.cc
@@ -14,7 +14,6 @@ details. */
#include <unistd.h>
#include <sys/param.h>
#include "pinfo.h"
-#include "psapi.h"
#include "cygtls.h"
#include "path.h"
#include "fhandler.h"
diff --git a/winsup/utils/dumper.cc b/winsup/utils/dumper.cc
index f21c93b..bc6c68a 100644
--- a/winsup/utils/dumper.cc
+++ b/winsup/utils/dumper.cc
@@ -34,6 +34,7 @@
#include <unistd.h>
#include <sys/param.h>
#include <windows.h>
+#define PSAPI_VERSION 1
#include <psapi.h>
#include "dumper.h"
diff --git a/winsup/utils/ldd.cc b/winsup/utils/ldd.cc
index f9b04ed..0d073c2 100644
--- a/winsup/utils/ldd.cc
+++ b/winsup/utils/ldd.cc
@@ -37,10 +37,10 @@
#include <unistd.h>
#include <libgen.h>
-#define PSAPI_VERSION 1
#include <windows.h>
#include <winternl.h>
#include <imagehlp.h>
+#define PSAPI_VERSION 1
#include <psapi.h>
struct option longopts[] =
diff --git a/winsup/utils/mingw/bloda.cc b/winsup/utils/mingw/bloda.cc
index ffaee52..330ac55 100644
--- a/winsup/utils/mingw/bloda.cc
+++ b/winsup/utils/mingw/bloda.cc
@@ -13,6 +13,7 @@
ntstatus.h for extended status codes below. */
#include <windows.h>
#undef WIN32_NO_STATUS
+#define PSAPI_VERSION 1
#include <psapi.h>
#include <winternl.h>
#include <ntstatus.h>
diff --git a/winsup/utils/module_info.cc b/winsup/utils/module_info.cc
index bf3a18b..e0bd4b7 100644
--- a/winsup/utils/module_info.cc
+++ b/winsup/utils/module_info.cc
@@ -10,6 +10,7 @@ details. */
#include <stdlib.h>
#include <windows.h>
+#define PSAPI_VERSION 1
#include <psapi.h>
#include "loadlib.h"
diff --git a/winsup/utils/pldd.c b/winsup/utils/pldd.c
index f077e63..2c085ea 100644
--- a/winsup/utils/pldd.c
+++ b/winsup/utils/pldd.c
@@ -16,6 +16,7 @@ details. */
#include <sys/cygwin.h>
#include <cygwin/version.h>
#include <windows.h>
+#define PSAPI_VERSION 1
#include <psapi.h>
struct option longopts[] =
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc
index 478ed8e..b516575 100644
--- a/winsup/utils/ps.cc
+++ b/winsup/utils/ps.cc
@@ -19,7 +19,6 @@ details. */
#include <limits.h>
#include <sys/cygwin.h>
#include <cygwin/version.h>
-#include <psapi.h>
#include <ntdef.h>
#include <ntdll.h>
#include "loadlib.h"