Define plugin version in all existing plugins

src/libcharon/plugins/addrblock/addrblock_plugin.c

@@ -94,7 +94,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *addrblock_plugin_create()
+PLUGIN_DEFINE(addrblock)
 {
 	private_addrblock_plugin_t *this;
 

src/libcharon/plugins/android_dns/android_dns_plugin.c

@@ -83,7 +83,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *android_dns_plugin_create()
+PLUGIN_DEFINE(android_dns)
 {
 	private_android_dns_plugin_t *this;
 

src/libcharon/plugins/android_log/android_log_plugin.c

@@ -66,7 +66,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *android_log_plugin_create()
+PLUGIN_DEFINE(android_log)
 {
 	private_android_log_plugin_t *this;
 

src/libcharon/plugins/attr/attr_plugin.c

@@ -90,7 +90,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *attr_plugin_create()
+PLUGIN_DEFINE(attr)
 {
 	private_attr_plugin_t *this;
 

src/libcharon/plugins/attr_sql/attr_sql_plugin.c

@@ -110,7 +110,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *attr_sql_plugin_create()
+PLUGIN_DEFINE(attr_sql)
 {
 	private_attr_sql_plugin_t *this;
 

src/libcharon/plugins/bypass_lan/bypass_lan_plugin.c

@@ -90,7 +90,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *bypass_lan_plugin_create()
+PLUGIN_DEFINE(bypass_lan)
 {
 	private_bypass_lan_plugin_t *this;
 

src/libcharon/plugins/certexpire/certexpire_plugin.c

@@ -89,7 +89,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *certexpire_plugin_create()
+PLUGIN_DEFINE(certexpire)
 {
 	private_certexpire_plugin_t *this;
 

src/libcharon/plugins/connmark/connmark_plugin.c

@@ -81,7 +81,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *connmark_plugin_create()
+PLUGIN_DEFINE(connmark)
 {
 	private_connmark_plugin_t *this;
 

src/libcharon/plugins/counters/counters_plugin.c

@@ -83,7 +83,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * Described in header
  */
-plugin_t *counters_plugin_create()
+PLUGIN_DEFINE(counters)
 {
 	private_counters_plugin_t *this;
 

src/libcharon/plugins/coupling/coupling_plugin.c

@@ -92,7 +92,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *coupling_plugin_create()
+PLUGIN_DEFINE(coupling)
 {
 	private_coupling_plugin_t *this;
 

src/libcharon/plugins/dhcp/dhcp_plugin.c

@@ -101,7 +101,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor.
  */
-plugin_t *dhcp_plugin_create()
+PLUGIN_DEFINE(dhcp)
 {
 	private_dhcp_plugin_t *this;
 

src/libcharon/plugins/dnscert/dnscert_plugin.c

@@ -148,7 +148,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *dnscert_plugin_create()
+PLUGIN_DEFINE(dnscert)
 {
 	private_dnscert_plugin_t *this;
 

src/libcharon/plugins/duplicheck/duplicheck_plugin.c

@@ -89,7 +89,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *duplicheck_plugin_create()
+PLUGIN_DEFINE(duplicheck)
 {
 	private_duplicheck_plugin_t *this;
 

src/libcharon/plugins/eap_aka/eap_aka_plugin.c

@@ -81,7 +81,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_aka_plugin_create()
+PLUGIN_DEFINE(eap_aka)
 {
 	private_eap_aka_plugin_t *this;
 

src/libcharon/plugins/eap_aka_3gpp/eap_aka_3gpp_plugin.c

@@ -147,7 +147,7 @@ METHOD(plugin_t, destroy, void, private_eap_aka_3gpp_t *this)
 /**
  * See header
  */
-plugin_t *eap_aka_3gpp_plugin_create()
+PLUGIN_DEFINE(eap_aka_3gpp)
 {
 	private_eap_aka_3gpp_t *this;
 

src/libcharon/plugins/eap_aka_3gpp2/eap_aka_3gpp2_plugin.c

@@ -126,7 +126,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *eap_aka_3gpp2_plugin_create()
+PLUGIN_DEFINE(eap_aka_3gpp2)
 {
 	private_eap_aka_3gpp2_t *this;
 

src/libcharon/plugins/eap_dynamic/eap_dynamic_plugin.c

@@ -46,7 +46,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_dynamic_plugin_create()
+PLUGIN_DEFINE(eap_dynamic)
 {
 	eap_dynamic_plugin_t *this;
 

src/libcharon/plugins/eap_gtc/eap_gtc_plugin.c

@@ -48,7 +48,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_gtc_plugin_create()
+PLUGIN_DEFINE(eap_gtc)
 {
 	eap_gtc_plugin_t *this;
 

src/libcharon/plugins/eap_identity/eap_identity_plugin.c

@@ -47,7 +47,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_identity_plugin_create()
+PLUGIN_DEFINE(eap_identity)
 {
 	eap_identity_plugin_t *this;
 

src/libcharon/plugins/eap_md5/eap_md5_plugin.c

@@ -51,7 +51,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_md5_plugin_create()
+PLUGIN_DEFINE(eap_md5)
 {
 	eap_md5_plugin_t *this;
 

src/libcharon/plugins/eap_mschapv2/eap_mschapv2_plugin.c

@@ -56,7 +56,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_mschapv2_plugin_create()
+PLUGIN_DEFINE(eap_mschapv2)
 {
 	eap_mschapv2_plugin_t *this;
 

src/libcharon/plugins/eap_peap/eap_peap_plugin.c

@@ -57,7 +57,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_peap_plugin_create()
+PLUGIN_DEFINE(eap_peap)
 {
 	eap_peap_plugin_t *this;
 

src/libcharon/plugins/eap_radius/eap_radius_plugin.c

@@ -346,7 +346,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_radius_plugin_create()
+PLUGIN_DEFINE(eap_radius)
 {
 	private_eap_radius_plugin_t *this;
 

src/libcharon/plugins/eap_sim/eap_sim_plugin.c

@@ -81,7 +81,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_sim_plugin_create()
+PLUGIN_DEFINE(eap_sim)
 {
 	private_eap_sim_plugin_t *this;
 

src/libcharon/plugins/eap_sim_file/eap_sim_file_plugin.c

@@ -127,7 +127,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *eap_sim_file_plugin_create()
+PLUGIN_DEFINE(eap_sim_file)
 {
 	private_eap_sim_file_t *this;
 

src/libcharon/plugins/eap_sim_pcsc/eap_sim_pcsc_plugin.c

@@ -71,7 +71,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *eap_sim_pcsc_plugin_create()
+PLUGIN_DEFINE(eap_sim_pcsc)
 {
 	private_eap_sim_pcsc_plugin_t *this;
 

src/libcharon/plugins/eap_simaka_pseudonym/eap_simaka_pseudonym_plugin.c

@@ -109,7 +109,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *eap_simaka_pseudonym_plugin_create()
+PLUGIN_DEFINE(eap_simaka_pseudonym)
 {
 	private_eap_simaka_pseudonym_t *this;
 

src/libcharon/plugins/eap_simaka_reauth/eap_simaka_reauth_plugin.c

@@ -109,7 +109,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *eap_simaka_reauth_plugin_create()
+PLUGIN_DEFINE(eap_simaka_reauth)
 {
 	private_eap_simaka_reauth_t *this;
 

src/libcharon/plugins/eap_simaka_sql/eap_simaka_sql_plugin.c

@@ -149,7 +149,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *eap_simaka_sql_plugin_create()
+PLUGIN_DEFINE(eap_simaka_sql)
 {
 	private_eap_simaka_sql_t *this;
 

src/libcharon/plugins/eap_tls/eap_tls_plugin.c

@@ -55,7 +55,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_tls_plugin_create()
+PLUGIN_DEFINE(eap_tls)
 {
 	eap_tls_plugin_t *this;
 

src/libcharon/plugins/eap_tnc/eap_tnc_plugin.c

@@ -59,7 +59,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_tnc_plugin_create()
+PLUGIN_DEFINE(eap_tnc)
 {
 	eap_tnc_plugin_t *this;
 

src/libcharon/plugins/eap_ttls/eap_ttls_plugin.c

@@ -57,7 +57,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *eap_ttls_plugin_create()
+PLUGIN_DEFINE(eap_ttls)
 {
 	eap_ttls_plugin_t *this;
 

src/libcharon/plugins/error_notify/error_notify_plugin.c

@@ -89,7 +89,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *error_notify_plugin_create()
+PLUGIN_DEFINE(error_notify)
 {
 	private_error_notify_plugin_t *this;
 

src/libcharon/plugins/ext_auth/ext_auth_plugin.c

@@ -136,7 +136,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *ext_auth_plugin_create()
+PLUGIN_DEFINE(ext_auth)
 {
 	private_ext_auth_plugin_t *this;
 

src/libcharon/plugins/farp/farp_plugin.c

@@ -89,7 +89,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *farp_plugin_create()
+PLUGIN_DEFINE(farp)
 {
 	private_farp_plugin_t *this;
 

src/libcharon/plugins/forecast/forecast_plugin.c

@@ -93,7 +93,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *forecast_plugin_create()
+PLUGIN_DEFINE(forecast)
 {
 	private_forecast_plugin_t *this;
 

src/libcharon/plugins/ha/ha_plugin.c

@@ -213,7 +213,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *ha_plugin_create()
+PLUGIN_DEFINE(ha)
 {
 	private_ha_plugin_t *this;
 

src/libcharon/plugins/ipseckey/ipseckey_plugin.c

@@ -126,7 +126,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *ipseckey_plugin_create()
+PLUGIN_DEFINE(ipseckey)
 {
 	private_ipseckey_plugin_t *this;
 

src/libcharon/plugins/kernel_iph/kernel_iph_plugin.c

@@ -57,7 +57,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * See header file
  */
-plugin_t *kernel_iph_plugin_create()
+PLUGIN_DEFINE(kernel_iph)
 {
 	private_kernel_iph_plugin_t *this;
 

src/libcharon/plugins/kernel_libipsec/kernel_libipsec_plugin.c

@@ -110,7 +110,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *kernel_libipsec_plugin_create()
+PLUGIN_DEFINE(kernel_libipsec)
 {
 	private_kernel_libipsec_plugin_t *this;
 

src/libcharon/plugins/kernel_netlink/kernel_netlink_plugin.c

@@ -82,7 +82,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *kernel_netlink_plugin_create()
+PLUGIN_DEFINE(kernel_netlink)
 {
 	private_kernel_netlink_plugin_t *this;
 

src/libcharon/plugins/kernel_pfkey/kernel_pfkey_plugin.c

@@ -57,7 +57,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *kernel_pfkey_plugin_create()
+PLUGIN_DEFINE(kernel_pfkey)
 {
 	private_kernel_pfkey_plugin_t *this;
 

src/libcharon/plugins/kernel_pfroute/kernel_pfroute_plugin.c

@@ -57,7 +57,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *kernel_pfroute_plugin_create()
+PLUGIN_DEFINE(kernel_pfroute)
 {
 	private_kernel_pfroute_plugin_t *this;
 

src/libcharon/plugins/kernel_wfp/kernel_wfp_plugin.c

@@ -60,7 +60,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *kernel_wfp_plugin_create()
+PLUGIN_DEFINE(kernel_wfp)
 {
 	private_kernel_wfp_plugin_t *this;
 

src/libcharon/plugins/led/led_plugin.c

@@ -82,7 +82,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *led_plugin_create()
+PLUGIN_DEFINE(led)
 {
 	private_led_plugin_t *this;
 

src/libcharon/plugins/load_tester/load_tester_plugin.c

@@ -266,7 +266,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *load_tester_plugin_create()
+PLUGIN_DEFINE(load_tester)
 {
 	private_load_tester_plugin_t *this;
 

src/libcharon/plugins/lookip/lookip_plugin.c

@@ -89,7 +89,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *lookip_plugin_create()
+PLUGIN_DEFINE(lookip)
 {
 	private_lookip_plugin_t *this;
 

src/libcharon/plugins/medcli/medcli_plugin.c

@@ -129,7 +129,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *medcli_plugin_create()
+PLUGIN_DEFINE(medcli)
 {
 	private_medcli_plugin_t *this;
 

src/libcharon/plugins/medsrv/medsrv_plugin.c

@@ -119,7 +119,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *medsrv_plugin_create()
+PLUGIN_DEFINE(medsrv)
 {
 	private_medsrv_plugin_t *this;
 

src/libcharon/plugins/osx_attr/osx_attr_plugin.c

@@ -83,7 +83,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *osx_attr_plugin_create()
+PLUGIN_DEFINE(osx_attr)
 {
 	private_osx_attr_plugin_t *this;
 

src/libcharon/plugins/p_cscf/p_cscf_plugin.c

@@ -83,7 +83,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * See header
  */
-plugin_t *p_cscf_plugin_create()
+PLUGIN_DEFINE(p_cscf)
 {
 	private_p_cscf_plugin_t *this;
 

src/libcharon/plugins/radattr/radattr_plugin.c

@@ -82,7 +82,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *radattr_plugin_create()
+PLUGIN_DEFINE(radattr)
 {
 	private_radattr_plugin_t *this;
 

src/libcharon/plugins/resolve/resolve_plugin.c

@@ -83,7 +83,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *resolve_plugin_create()
+PLUGIN_DEFINE(resolve)
 {
 	private_resolve_plugin_t *this;
 

src/libcharon/plugins/save_keys/save_keys_plugin.c

@@ -88,7 +88,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor.
  */
-plugin_t *save_keys_plugin_create()
+PLUGIN_DEFINE(save_keys)
 {
 	private_save_keys_plugin_t *this;
 

src/libcharon/plugins/selinux/selinux_plugin.c

@@ -81,7 +81,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * Described in header
  */
-plugin_t *selinux_plugin_create()
+PLUGIN_DEFINE(selinux)
 {
 	private_selinux_plugin_t *this;
 

src/libcharon/plugins/smp/smp.c

@@ -741,7 +741,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * Described in header file
  */
-plugin_t *smp_plugin_create()
+PLUGIN_DEFINE(smp)
 {
 	struct sockaddr_un unix_addr = { AF_UNIX, IPSEC_PIDDIR "/charon.xml"};
 	private_smp_t *this;

src/libcharon/plugins/socket_default/socket_default_plugin.c

@@ -61,7 +61,7 @@ METHOD(plugin_t, get_features, int,
 /*
  * see header file
  */
-plugin_t *socket_default_plugin_create()
+PLUGIN_DEFINE(socket_default)
 {
 	private_socket_default_plugin_t *this;
 

src/libcharon/plugins/socket_dynamic/socket_dynamic_plugin.c

@@ -61,7 +61,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *socket_dynamic_plugin_create()
+PLUGIN_DEFINE(socket_dynamic)
 {
 	private_socket_dynamic_plugin_t *this;
 

src/libcharon/plugins/socket_win/socket_win_plugin.c

@@ -59,7 +59,7 @@ METHOD(plugin_t, get_features, int,
 /**
  * Create instance of socket-win plugin
  */
-plugin_t *socket_win_plugin_create()
+PLUGIN_DEFINE(socket_win)
 {
 	private_socket_win_plugin_t *this;
 

src/libcharon/plugins/sql/sql_plugin.c

@@ -130,7 +130,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *sql_plugin_create()
+PLUGIN_DEFINE(sql)
 {
 	private_sql_plugin_t *this;
 

src/libcharon/plugins/stroke/stroke_plugin.c

@@ -92,7 +92,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *stroke_plugin_create()
+PLUGIN_DEFINE(stroke)
 {
 	private_stroke_plugin_t *this;
 

src/libcharon/plugins/systime_fix/systime_fix_plugin.c

@@ -294,7 +294,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *systime_fix_plugin_create()
+PLUGIN_DEFINE(systime_fix)
 {
 	private_systime_fix_plugin_t *this;
 

src/libcharon/plugins/tnc_ifmap/tnc_ifmap_plugin.c

@@ -111,7 +111,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *tnc_ifmap_plugin_create()
+PLUGIN_DEFINE(tnc_ifmap)
 {
 	private_tnc_ifmap_plugin_t *this;
 

src/libcharon/plugins/tnc_pdp/tnc_pdp_plugin.c

@@ -89,7 +89,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *tnc_pdp_plugin_create()
+PLUGIN_DEFINE(tnc_pdp)
 {
 	private_tnc_pdp_plugin_t *this;
 

src/libcharon/plugins/unity/unity_plugin.c

@@ -104,7 +104,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *unity_plugin_create()
+PLUGIN_DEFINE(unity)
 {
 	private_unity_plugin_t *this;
 

src/libcharon/plugins/updown/updown_plugin.c

@@ -101,7 +101,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *updown_plugin_create()
+PLUGIN_DEFINE(updown)
 {
 	private_updown_plugin_t *this;
 

src/libcharon/plugins/vici/vici_plugin.c

@@ -189,7 +189,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *vici_plugin_create()
+PLUGIN_DEFINE(vici)
 {
 	private_vici_plugin_t *this;
 

src/libcharon/plugins/whitelist/whitelist_plugin.c

@@ -89,7 +89,7 @@ METHOD(plugin_t, destroy, void,
 /**
  * Plugin constructor
  */
-plugin_t *whitelist_plugin_create()
+PLUGIN_DEFINE(whitelist)
 {
 	private_whitelist_plugin_t *this;
 

src/libcharon/plugins/xauth_eap/xauth_eap_plugin.c

@@ -45,7 +45,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *xauth_eap_plugin_create()
+PLUGIN_DEFINE(xauth_eap)
 {
 	xauth_eap_plugin_t *this;
 

src/libcharon/plugins/xauth_generic/xauth_generic_plugin.c

@@ -47,7 +47,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *xauth_generic_plugin_create()
+PLUGIN_DEFINE(xauth_generic)
 {
 	xauth_generic_plugin_t *this;
 

src/libcharon/plugins/xauth_noauth/xauth_noauth_plugin.c

@@ -45,7 +45,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *xauth_noauth_plugin_create()
+PLUGIN_DEFINE(xauth_noauth)
 {
 	xauth_noauth_plugin_t *this;
 

src/libcharon/plugins/xauth_pam/xauth_pam_plugin.c

@@ -97,7 +97,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *xauth_pam_plugin_create()
+PLUGIN_DEFINE(xauth_pam)
 {
 	private_xauth_pam_plugin_t *this;
 

src/libstrongswan/plugins/acert/acert_plugin.c

@@ -81,7 +81,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *acert_plugin_create()
+PLUGIN_DEFINE(acert)
 {
 	private_acert_plugin_t *this;
 

src/libstrongswan/plugins/aes/aes_plugin.c

@@ -61,7 +61,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *aes_plugin_create()
+PLUGIN_DEFINE(aes)
 {
 	private_aes_plugin_t *this;
 

src/libstrongswan/plugins/aesni/aesni_plugin.c

@@ -112,7 +112,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *aesni_plugin_create()
+PLUGIN_DEFINE(aesni)
 {
 	private_aesni_plugin_t *this;
 

src/libstrongswan/plugins/af_alg/af_alg_plugin.c

@@ -92,7 +92,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *af_alg_plugin_create()
+PLUGIN_DEFINE(af_alg)
 {
 	private_af_alg_plugin_t *this;
 

src/libstrongswan/plugins/agent/agent_plugin.c

@@ -60,7 +60,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *agent_plugin_create()
+PLUGIN_DEFINE(agent)
 {
 	private_agent_plugin_t *this;
 

src/libstrongswan/plugins/blowfish/blowfish_plugin.c

@@ -57,7 +57,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *blowfish_plugin_create()
+PLUGIN_DEFINE(blowfish)
 {
 	private_blowfish_plugin_t *this;
 

src/libstrongswan/plugins/botan/botan_plugin.c

@@ -391,7 +391,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * Described in header
  */
-plugin_t *botan_plugin_create()
+PLUGIN_DEFINE(botan)
 {
 	private_botan_plugin_t *this;
 

src/libstrongswan/plugins/ccm/ccm_plugin.c

@@ -94,7 +94,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *ccm_plugin_create()
+PLUGIN_DEFINE(ccm)
 {
 	private_ccm_plugin_t *this;
 

src/libstrongswan/plugins/chapoly/chapoly_plugin.c

@@ -61,7 +61,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *chapoly_plugin_create()
+PLUGIN_DEFINE(chapoly)
 {
 	private_chapoly_plugin_t *this;
 

src/libstrongswan/plugins/cmac/cmac_plugin.c

@@ -62,7 +62,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *cmac_plugin_create()
+PLUGIN_DEFINE(cmac)
 {
 	private_cmac_plugin_t *this;
 

src/libstrongswan/plugins/constraints/constraints_plugin.c

@@ -83,7 +83,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *constraints_plugin_create()
+PLUGIN_DEFINE(constraints)
 {
 	private_constraints_plugin_t *this;
 

src/libstrongswan/plugins/ctr/ctr_plugin.c

@@ -70,7 +70,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *ctr_plugin_create()
+PLUGIN_DEFINE(ctr)
 {
 	private_ctr_plugin_t *this;
 

src/libstrongswan/plugins/curl/curl_plugin.c

@@ -210,7 +210,7 @@ static void set_ssl_backend()
 /*
  * see header file
  */
-plugin_t *curl_plugin_create()
+PLUGIN_DEFINE(curl)
 {
 	CURLcode res;
 	private_curl_plugin_t *this;

src/libstrongswan/plugins/curve25519/curve25519_plugin.c

@@ -82,7 +82,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *curve25519_plugin_create()
+PLUGIN_DEFINE(curve25519)
 {
 	private_curve25519_plugin_t *this;
 

src/libstrongswan/plugins/des/des_plugin.c

@@ -58,7 +58,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *des_plugin_create()
+PLUGIN_DEFINE(des)
 {
 	private_des_plugin_t *this;
 

src/libstrongswan/plugins/dnskey/dnskey_plugin.c

@@ -63,7 +63,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *dnskey_plugin_create()
+PLUGIN_DEFINE(dnskey)
 {
 	private_dnskey_plugin_t *this;
 

src/libstrongswan/plugins/drbg/drbg_plugin.c

@@ -75,7 +75,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *drbg_plugin_create()
+PLUGIN_DEFINE(drbg)
 {
 	private_drbg_plugin_t *this;
 

src/libstrongswan/plugins/files/files_plugin.c

@@ -59,7 +59,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *files_plugin_create()
+PLUGIN_DEFINE(files)
 {
 	private_files_plugin_t *this;
 

src/libstrongswan/plugins/fips_prf/fips_prf_plugin.c

@@ -59,7 +59,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *fips_prf_plugin_create()
+PLUGIN_DEFINE(fips_prf)
 {
 	private_fips_prf_plugin_t *this;
 

src/libstrongswan/plugins/gcm/gcm_plugin.c

@@ -76,7 +76,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *gcm_plugin_create()
+PLUGIN_DEFINE(gcm)
 {
 	private_gcm_plugin_t *this;
 

src/libstrongswan/plugins/gcrypt/gcrypt_plugin.c

@@ -172,7 +172,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *gcrypt_plugin_create()
+PLUGIN_DEFINE(gcrypt)
 {
 	private_gcrypt_plugin_t *this;
 	u_char *dummy[1];

src/libstrongswan/plugins/gmp/gmp_plugin.c

@@ -158,7 +158,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *gmp_plugin_create()
+PLUGIN_DEFINE(gmp)
 {
 	private_gmp_plugin_t *this;
 

src/libstrongswan/plugins/hmac/hmac_plugin.c

@@ -90,7 +90,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *hmac_plugin_create()
+PLUGIN_DEFINE(hmac)
 {
 	private_hmac_plugin_t *this;
 

src/libstrongswan/plugins/kdf/kdf_plugin.c

@@ -71,7 +71,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * Described in header
  */
-plugin_t *kdf_plugin_create()
+PLUGIN_DEFINE(kdf)
 {
 	private_kdf_plugin_t *this;
 

src/libstrongswan/plugins/keychain/keychain_plugin.c

@@ -81,7 +81,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *keychain_plugin_create()
+PLUGIN_DEFINE(keychain)
 {
 	private_keychain_plugin_t *this;
 

src/libstrongswan/plugins/ldap/ldap_plugin.c

@@ -59,7 +59,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *ldap_plugin_create()
+PLUGIN_DEFINE(ldap)
 {
 	private_ldap_plugin_t *this;
 

src/libstrongswan/plugins/md4/md4_plugin.c

@@ -56,7 +56,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *md4_plugin_create()
+PLUGIN_DEFINE(md4)
 {
 	private_md4_plugin_t *this;
 

src/libstrongswan/plugins/md5/md5_plugin.c

@@ -56,7 +56,7 @@ METHOD(plugin_t, destroy, void,
 /*
  * see header file
  */
-plugin_t *md5_plugin_create()
+PLUGIN_DEFINE(md5)
 {
 	private_md5_plugin_t *this;