From 95d07e7e7e791606cf385cf1410f5ab2639ba03d Mon Sep 17 00:00:00 2001 From: Nathan Moinvaziri Date: Tue, 6 Dec 2022 16:25:35 -0800 Subject: [PATCH] Remove extern C from platform specific headers. --- config_env.h | 8 -------- config_gnome2.h | 8 -------- config_gnome3.h | 8 -------- config_kde.h | 8 -------- config_mac.h | 8 -------- config_win.h | 8 -------- execute_jscore.h | 8 -------- execute_wsh.h | 8 -------- resolver_gnome3.h | 8 -------- resolver_mac.h | 8 -------- resolver_posix.h | 8 -------- resolver_win8.h | 8 -------- resolver_winrt.h | 8 -------- resolver_winxp.h | 8 -------- wpad_dhcp_mac.h | 8 -------- wpad_dhcp_posix.h | 8 -------- wpad_dhcp_win.h | 8 -------- 17 files changed, 136 deletions(-) diff --git a/config_env.h b/config_env.h index 0fed05f..5bc7856 100644 --- a/config_env.h +++ b/config_env.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_config_env_get_auto_discover(void); char *proxy_config_env_get_auto_config_url(void); char *proxy_config_env_get_proxy(const char *scheme); @@ -13,7 +9,3 @@ bool proxy_config_env_global_init(void); bool proxy_config_env_global_cleanup(void); proxy_config_i_s *proxy_config_env_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/config_gnome2.h b/config_gnome2.h index 8437cea..72b43c6 100644 --- a/config_gnome2.h +++ b/config_gnome2.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_config_gnome2_get_auto_discover(void); char *proxy_config_gnome2_get_auto_config_url(void); char *proxy_config_gnome2_get_proxy(const char *scheme); @@ -13,7 +9,3 @@ bool proxy_config_gnome2_global_init(void); bool proxy_config_gnome2_global_cleanup(void); proxy_config_i_s *proxy_config_gnome2_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/config_gnome3.h b/config_gnome3.h index e8d9a99..9327cca 100644 --- a/config_gnome3.h +++ b/config_gnome3.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_config_gnome3_get_auto_discover(void); char *proxy_config_gnome3_get_auto_config_url(void); char *proxy_config_gnome3_get_proxy(const char *scheme); @@ -13,7 +9,3 @@ bool proxy_config_gnome3_global_init(void); bool proxy_config_gnome3_global_cleanup(void); proxy_config_i_s *proxy_config_gnome3_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/config_kde.h b/config_kde.h index 7cb1956..50ae99c 100644 --- a/config_kde.h +++ b/config_kde.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_config_kde_get_auto_discover(void); char *proxy_config_kde_get_auto_config_url(void); char *proxy_config_kde_get_proxy(const char *scheme); @@ -13,7 +9,3 @@ bool proxy_config_kde_global_init(void); bool proxy_config_kde_global_cleanup(void); proxy_config_i_s *proxy_config_kde_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/config_mac.h b/config_mac.h index 7221337..6c041ec 100644 --- a/config_mac.h +++ b/config_mac.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_config_mac_get_auto_discover(void); char *proxy_config_mac_get_auto_config_url(void); char *proxy_config_mac_get_proxy(const char *scheme); @@ -13,7 +9,3 @@ bool proxy_config_mac_global_init(void); bool proxy_config_mac_global_cleanup(void); proxy_config_i_s *proxy_config_mac_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/config_win.h b/config_win.h index 2d45b87..e74c874 100644 --- a/config_win.h +++ b/config_win.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_config_win_get_auto_discover(void); char *proxy_config_win_get_auto_config_url(void); char *proxy_config_win_get_proxy(const char *scheme); @@ -13,7 +9,3 @@ bool proxy_config_win_global_init(void); bool proxy_config_win_global_cleanup(void); proxy_config_i_s *proxy_config_win_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/execute_jscore.h b/execute_jscore.h index 4e09b4a..d333cc6 100644 --- a/execute_jscore.h +++ b/execute_jscore.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_execute_jscore_get_proxies_for_url(void *ctx, const char *script, const char *url); const char *proxy_execute_jscore_get_list(void *ctx); int32_t proxy_execute_jscore_get_error(void *ctx); @@ -15,7 +11,3 @@ bool proxy_execute_jscore_global_init(void); bool proxy_execute_jscore_global_cleanup(void); proxy_execute_i_s *proxy_execute_jscore_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/execute_wsh.h b/execute_wsh.h index 5f90084..ff499a4 100644 --- a/execute_wsh.h +++ b/execute_wsh.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_execute_wsh_get_proxies_for_url(void *ctx, const char *script, const char *url); const char *proxy_execute_wsh_get_list(void *ctx); int32_t proxy_execute_wsh_get_error(void *ctx); @@ -15,7 +11,3 @@ bool proxy_execute_wsh_global_init(void); bool proxy_execute_wsh_global_cleanup(void); proxy_execute_i_s *proxy_execute_wsh_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/resolver_gnome3.h b/resolver_gnome3.h index 84aa3f8..6ef313f 100644 --- a/resolver_gnome3.h +++ b/resolver_gnome3.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_resolver_gnome3_get_proxies_for_url(void *ctx, const char *url); const char *proxy_resolver_gnome3_get_list(void *ctx); int32_t proxy_resolver_gnome3_get_error(void *ctx); @@ -19,7 +15,3 @@ bool proxy_resolver_gnome3_global_init(void); bool proxy_resolver_gnome3_global_cleanup(void); proxy_resolver_i_s *proxy_resolver_gnome3_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/resolver_mac.h b/resolver_mac.h index 4bf2020..882161a 100644 --- a/resolver_mac.h +++ b/resolver_mac.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_resolver_mac_get_proxies_for_url(void *ctx, const char *url); const char *proxy_resolver_mac_get_list(void *ctx); int32_t proxy_resolver_mac_get_error(void *ctx); @@ -19,7 +15,3 @@ bool proxy_resolver_mac_global_init(void); bool proxy_resolver_mac_global_cleanup(void); proxy_resolver_i_s *proxy_resolver_mac_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/resolver_posix.h b/resolver_posix.h index 7aeb0b9..024ac25 100644 --- a/resolver_posix.h +++ b/resolver_posix.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_resolver_posix_get_proxies_for_url(void *ctx, const char *url); const char *proxy_resolver_posix_get_list(void *ctx); int32_t proxy_resolver_posix_get_error(void *ctx); @@ -20,7 +16,3 @@ bool proxy_resolver_posix_init_ex(void *threadpool); bool proxy_resolver_posix_global_cleanup(void); proxy_resolver_i_s *proxy_resolver_posix_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/resolver_win8.h b/resolver_win8.h index a55f8ce..3cfc8b7 100644 --- a/resolver_win8.h +++ b/resolver_win8.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_resolver_win8_get_proxies_for_url(void *ctx, const char *url); const char *proxy_resolver_win8_get_list(void *ctx); int32_t proxy_resolver_win8_get_error(void *ctx); @@ -19,7 +15,3 @@ bool proxy_resolver_win8_global_init(void); bool proxy_resolver_win8_global_cleanup(void); proxy_resolver_i_s *proxy_resolver_win8_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/resolver_winrt.h b/resolver_winrt.h index cd7f779..794105a 100644 --- a/resolver_winrt.h +++ b/resolver_winrt.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_resolver_winrt_get_proxies_for_url(void *ctx, const char *url); const char *proxy_resolver_winrt_get_list(void *ctx); int32_t proxy_resolver_winrt_get_error(void *ctx); @@ -19,7 +15,3 @@ bool proxy_resolver_winrt_global_init(void); bool proxy_resolver_winrt_global_cleanup(void); proxy_resolver_i_s *proxy_resolver_winrt_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/resolver_winxp.h b/resolver_winxp.h index 99be59c..91e44f5 100644 --- a/resolver_winxp.h +++ b/resolver_winxp.h @@ -1,9 +1,5 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - bool proxy_resolver_winxp_get_proxies_for_url(void *ctx, const char *url); const char *proxy_resolver_winxp_get_list(void *ctx); int32_t proxy_resolver_winxp_get_error(void *ctx); @@ -19,7 +15,3 @@ bool proxy_resolver_winxp_global_init(void); bool proxy_resolver_winxp_global_cleanup(void); proxy_resolver_i_s *proxy_resolver_winxp_get_interface(void); - -#ifdef __cplusplus -} -#endif diff --git a/wpad_dhcp_mac.h b/wpad_dhcp_mac.h index fa8a08f..35f75c4 100644 --- a/wpad_dhcp_mac.h +++ b/wpad_dhcp_mac.h @@ -1,12 +1,4 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - // Request WPAD url using DHCP with a particular network adapter char *wpad_dhcp_adapter_mac(uint8_t bind_ip[4], net_adapter_s *adapter, int32_t timeout_sec); - -#ifdef __cplusplus -} -#endif diff --git a/wpad_dhcp_posix.h b/wpad_dhcp_posix.h index 51a5eed..aa1321e 100644 --- a/wpad_dhcp_posix.h +++ b/wpad_dhcp_posix.h @@ -1,12 +1,4 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - // Request WPAD url using DHCP with a particular network adapter char *wpad_dhcp_adapter_posix(uint8_t bind_ip[4], net_adapter_s *adapter, int32_t timeout_sec); - -#ifdef __cplusplus -} -#endif diff --git a/wpad_dhcp_win.h b/wpad_dhcp_win.h index 3e93cff..bf10ec1 100644 --- a/wpad_dhcp_win.h +++ b/wpad_dhcp_win.h @@ -1,12 +1,4 @@ #pragma once -#ifdef __cplusplus -extern "C" { -#endif - // Request WPAD url using DHCP with a particular network adapter char *wpad_dhcp_adapter_win(uint8_t bind_ip[4], net_adapter_s *adapter, int32_t timeout_sec); - -#ifdef __cplusplus -} -#endif