[PATCH 1/2] Cygwin: Drop pointless loadlib.h includes in utilities

Jon Turney jon.turney@dronecode.org.uk
Sat Feb 26 16:40:53 GMT 2022


These utilities used to LoadLibrary()/GetProcAddress(), but don't
anymore.
---
 winsup/utils/cygpath.cc     | 1 -
 winsup/utils/module_info.cc | 1 -
 winsup/utils/path.cc        | 1 -
 winsup/utils/ps.cc          | 1 -
 4 files changed, 4 deletions(-)

diff --git a/winsup/utils/cygpath.cc b/winsup/utils/cygpath.cc
index 701c34998..9873e7b16 100644
--- a/winsup/utils/cygpath.cc
+++ b/winsup/utils/cygpath.cc
@@ -29,7 +29,6 @@ details. */
 #include <ntdll.h>
 
 #include "wide_path.h"
-#include "loadlib.h"
 
 static char *prog_name;
 static char *file_arg, *output_arg;
diff --git a/winsup/utils/module_info.cc b/winsup/utils/module_info.cc
index e0bd4b71a..3e2fc28e2 100644
--- a/winsup/utils/module_info.cc
+++ b/winsup/utils/module_info.cc
@@ -12,7 +12,6 @@ details. */
 #include <windows.h>
 #define PSAPI_VERSION 1
 #include <psapi.h>
-#include "loadlib.h"
 
 /* Returns full name of Dll, which is loaded by hProcess at BaseAddress.
    Uses psapi.dll. */
diff --git a/winsup/utils/path.cc b/winsup/utils/path.cc
index df0037c15..fe55a646d 100644
--- a/winsup/utils/path.cc
+++ b/winsup/utils/path.cc
@@ -28,7 +28,6 @@ details. */
 #ifdef FSTAB_ONLY
 #include <sys/cygwin.h>
 #endif
-#include "loadlib.h"
 
 #ifndef FSTAB_ONLY
 /* Used when treating / and \ as equivalent. */
diff --git a/winsup/utils/ps.cc b/winsup/utils/ps.cc
index b51657535..dbcacbab4 100644
--- a/winsup/utils/ps.cc
+++ b/winsup/utils/ps.cc
@@ -21,7 +21,6 @@ details. */
 #include <cygwin/version.h>
 #include <ntdef.h>
 #include <ntdll.h>
-#include "loadlib.h"
 
 /* Maximum possible path length under NT.  There's no official define
    for that value.  Note that PATH_MAX is only 4K. */
-- 
2.35.1



More information about the Cygwin-patches mailing list