[GNUnet-SVN] r34096 - gnunet/src/transport

[gnunet]

Author: LRN
Date: 2014-08-01 14:20:32 +0200 (Fri, 01 Aug 2014)
New Revision: 34096

Modified:
   gnunet/src/transport/plugin_transport_wlan.c
Log:
Don't use the 'interface' name, it conflicts with definitions in W32 headers

Modified: gnunet/src/transport/plugin_transport_wlan.c
===================================================================
--- gnunet/src/transport/plugin_transport_wlan.c        2014-07-31 14:58:51 UTC 
(rev 34095)
+++ gnunet/src/transport/plugin_transport_wlan.c        2014-08-01 12:20:32 UTC 
(rev 34096)
@@ -453,7 +453,7 @@
   /**
    * 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 @@
     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 @@
   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 @@
       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 @@
   }
 
   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 @@
   {
   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,