summaryrefslogtreecommitdiff
path: root/src/transport/plugin_transport_wlan.c
diff options
context:
space:
mode:
authorLRN <lrn1986@gmail.com>2014-08-01 12:20:32 +0000
committerLRN <lrn1986@gmail.com>2014-08-01 12:20:32 +0000
commit1fed0331759cf7f2c7a60b7a8c3a478f1ebc251d (patch)
treefce9d0e889f1881dd8d5a3a5ce202096c96b4e2e /src/transport/plugin_transport_wlan.c
parent976ccd4fc024f26de4b6fc801ba8fea1860430dd (diff)
Don't use the 'interface' name, it conflicts with definitions in W32 headers
Diffstat (limited to 'src/transport/plugin_transport_wlan.c')
-rw-r--r--src/transport/plugin_transport_wlan.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/transport/plugin_transport_wlan.c b/src/transport/plugin_transport_wlan.c
index 32c43a3aa..0d72c1e0f 100644
--- a/src/transport/plugin_transport_wlan.c
+++ b/src/transport/plugin_transport_wlan.c
@@ -453,7 +453,7 @@ struct Plugin
/**
* The interface of the wlan card given to us by the user.
*/
- char *interface;
+ char *wlan_interface;
/**
* Tokenizer for demultiplexing of data packets resulting from
@@ -1953,7 +1953,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_DONE (void *cls)
GNUNET_SERVER_mst_destroy (plugin->helper_payload_tokenizer);
plugin->helper_payload_tokenizer = NULL;
}
- GNUNET_free_non_null (plugin->interface);
+ GNUNET_free_non_null (plugin->wlan_interface);
GNUNET_free (plugin);
GNUNET_free (api);
return NULL;
@@ -2107,7 +2107,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
struct GNUNET_TRANSPORT_PluginEnvironment *env = cls;
struct GNUNET_TRANSPORT_PluginFunctions *api;
struct Plugin *plugin;
- char *interface;
+ char *wlan_interface;
unsigned long long testmode;
char *binary;
@@ -2160,7 +2160,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
GNUNET_CONFIGURATION_get_value_string (env->cfg,
CONFIG_NAME,
"INTERFACE",
- &interface))
+ &wlan_interface))
{
GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
CONFIG_NAME,
@@ -2169,7 +2169,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
}
plugin = GNUNET_new (struct Plugin);
- plugin->interface = interface;
+ plugin->wlan_interface = wlan_interface;
plugin->env = env;
GNUNET_STATISTICS_set (plugin->env->stats,
_("# sessions allocated"),
@@ -2194,7 +2194,7 @@ LIBGNUNET_PLUGIN_TRANSPORT_INIT (void *cls)
{
case 0: /* normal */
plugin->helper_argv[0] = (char *) HELPER_NAME;
- plugin->helper_argv[1] = interface;
+ plugin->helper_argv[1] = wlan_interface;
plugin->helper_argv[2] = NULL;
plugin->suid_helper = GNUNET_HELPER_start (GNUNET_NO,
HELPER_NAME,