[glib-networking/mcatanzaro/#185] Try to fix environment proxy resolver on Windows




commit 9e61b52d2fe7cd473f53bd8a8be8691882d8e870
Author: Michael Catanzaro <mcatanzaro redhat com>
Date:   Fri Oct 14 08:17:16 2022 -0500

    Try to fix environment proxy resolver on Windows
    
    The entry points were not exported, oops! Found by Chun-wei Fan.
    
    Hopefully fixes #185

 .gitlab-ci/test-msvc.bat                    | 3 +--
 proxy/environment/environmentproxy-module.c | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)
---
diff --git a/.gitlab-ci/test-msvc.bat b/.gitlab-ci/test-msvc.bat
index 92392806..e2a1f855 100644
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -26,9 +26,8 @@ set INCLUDE=%DEPS_DIR%\include;%DEPS_DIR%\include\glib-2.0;%INCLUDE%
 set PKG_CONFIG_PATH=%DEPS_DIR%\lib\pkgconfig
 
 :: FIXME: make warnings fatal
-:: FIXME: Environment proxy ought to work on Windows: 
https://gitlab.gnome.org/GNOME/glib-networking/-/issues/185
 pip3 install --upgrade --user meson==0.60.0  || goto :error
-meson build -Dgnutls=disabled -Dopenssl=enabled -Denvironment_proxy=disabled -Ddebug_logs=true || goto :error
+meson build -Dgnutls=disabled -Dopenssl=enabled -Denvironment_proxy=enabled -Ddebug_logs=true || goto :error
 ninja -C build || goto :error
 
 meson test -C build --timeout-multiplier=10 || goto :error
diff --git a/proxy/environment/environmentproxy-module.c b/proxy/environment/environmentproxy-module.c
index 46280233..3365c2e3 100644
--- a/proxy/environment/environmentproxy-module.c
+++ b/proxy/environment/environmentproxy-module.c
@@ -26,7 +26,7 @@
 #include "genvironmentproxyresolver.h"
 
 
-void
+GLIB_NETWORKING_EXPORT void
 g_io_environmentproxy_load (GIOModule *module)
 {
   gchar *locale_dir;
@@ -49,12 +49,12 @@ g_io_environmentproxy_load (GIOModule *module)
   g_free (locale_dir);
 }
 
-void
+GLIB_NETWORKING_EXPORT void
 g_io_environmentproxy_unload (GIOModule *module)
 {
 }
 
-gchar **
+GLIB_NETWORKING_EXPORT gchar **
 g_io_environmentproxy_query (void)
 {
   gchar *eps[] = {


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]