Index: trunk/lib/libtrace.h.in
===================================================================
--- trunk/lib/libtrace.h.in	(revision 1073)
+++ trunk/lib/libtrace.h.in	(revision 1076)
@@ -569,5 +569,5 @@
  * and then prints out the help() function registered with each input module
  */
-DLLEXPORT void trace_help();
+DLLEXPORT void trace_help(void);
 
 /** @name Trace management
@@ -938,5 +938,5 @@
  *
  */
-DLLEXPORT void *trace_get_payload_from_link(void *link,
+DLLEXPORT void *trace_get_payload_from_link(void *linkptr,
 		libtrace_linktype_t linktype, 
 		uint16_t *type, uint32_t *remaining);
@@ -1464,5 +1464,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tsft(void *link,
+DLLEXPORT bool trace_get_wireless_tsft(void *linkptr,
         libtrace_linktype_t linktype, uint64_t *tsft);
 
@@ -1473,5 +1473,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_rate(void *link,
+DLLEXPORT bool trace_get_wireless_rate(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *rate);
 
@@ -1483,5 +1483,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_freq(void *link,
+DLLEXPORT bool trace_get_wireless_freq(void *linkptr,
         libtrace_linktype_t linktype, uint16_t *freq);
 
@@ -1493,5 +1493,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_signal_strength_dbm(void *link,
+DLLEXPORT bool trace_get_wireless_signal_strength_dbm(void *linkptr,
         libtrace_linktype_t linktype, int8_t *strength);
 
@@ -1503,5 +1503,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_noise_strength_dbm(void *link,
+DLLEXPORT bool trace_get_wireless_noise_strength_dbm(void *linkptr,
         libtrace_linktype_t linktype, int8_t *strength);
 
@@ -1513,5 +1513,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_signal_strength_db(void *link,
+DLLEXPORT bool trace_get_wireless_signal_strength_db(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *strength);
 
@@ -1523,5 +1523,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_noise_strength_db(void *link,
+DLLEXPORT bool trace_get_wireless_noise_strength_db(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *strength);
 
@@ -1533,5 +1533,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tx_attenuation(void *link,
+DLLEXPORT bool trace_get_wireless_tx_attenuation(void *linkptr,
         libtrace_linktype_t linktype, uint16_t *attenuation);
 
@@ -1543,5 +1543,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tx_attenuation_db(void *link,
+DLLEXPORT bool trace_get_wireless_tx_attenuation_db(void *linkptr,
         libtrace_linktype_t linktype, uint16_t *attenuation);
 
@@ -1551,5 +1551,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_tx_power_dbm(void *link, libtrace_linktype_t
+DLLEXPORT bool trace_get_wireless_tx_power_dbm(void *linkptr, libtrace_linktype_t
 		linktype, int8_t *txpower);
 
@@ -1560,5 +1560,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_antenna(void *link,
+DLLEXPORT bool trace_get_wireless_antenna(void *linkptr,
         libtrace_linktype_t linktype, uint8_t *antenna);
 
@@ -1569,5 +1569,5 @@
  * @return true if the field was available, false if not.
  */
-DLLEXPORT bool trace_get_wireless_fcs(void *link,
+DLLEXPORT bool trace_get_wireless_fcs(void *linkptr,
         libtrace_linktype_t linktype, uint32_t *fcs);