Move DLL support to lib/fs

2 files changed, 1 insertions, 19 deletions

diff --git a/src/common/util.c b/src/common/util.c
index b31bb834e1..135af77c68 100644
--- a/src/common/util.c
+++ b/src/common/util.c
@@ -134,18 +134,3 @@ ENABLE_GCC_WARNING(aggregate-return)
 /* =====
  * Time
  * ===== */
-
-#ifdef _WIN32
-HANDLE
-load_windows_system_library(const TCHAR *library_name)
-{
-  TCHAR path[MAX_PATH];
-  unsigned n;
-  n = GetSystemDirectory(path, MAX_PATH);
-  if (n == 0 || n + _tcslen(library_name) + 2 >= MAX_PATH)
-    return 0;
-  _tcscat(path, TEXT("\\"));
-  _tcscat(path, library_name);
-  return LoadLibrary(path);
-}
-#endif /* defined(_WIN32) */
diff --git a/src/common/util.h b/src/common/util.h
index f174cd3667..ffd958c42c 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -40,6 +40,7 @@
 #include "lib/fs/path.h"
 #include "lib/encoding/time_fmt.h"
 #include "lib/encoding/cstring.h"
+#include "lib/fs/winlib.h"
 
 void tor_log_mallinfo(int severity);
 
@@ -76,8 +77,4 @@ void tor_log_mallinfo(int severity);
   ((isSock) ? read_all_from_socket((fd), (buf), (count)) \
             : read_all_from_fd((int)(fd), (buf), (count)))
 
-#ifdef _WIN32
-HANDLE load_windows_system_library(const TCHAR *library_name);
-#endif
-
 #endif /* !defined(TOR_UTIL_H) */