From: Aurelien Jacobs <redacted>
Date: Wed, 20 Aug 2014 15:40:22 +0000 (+0200)
Subject: Rename sp_get_signals() parameter to avoid name clash with Qt headers.
X-Git-Tag: libserialport-0.1.1~113
X-Git-Url: http://sigrok.org/gitweb/?p=libserialport.git;a=commitdiff_plain;h=f3ccf157cb6183c95365e3ba1791dc247150e872

Rename sp_get_signals() parameter to avoid name clash with Qt headers.
---

diff --git a/libserialport.h.in b/libserialport.h.in
index 472c1d0..6fb9b17 100644
--- a/libserialport.h.in
+++ b/libserialport.h.in
@@ -1196,13 +1196,13 @@ void sp_free_event_set(struct sp_event_set *event_set);
  * the sp_signal enum.
  *
  * @param port Pointer to port structure.
- * @param signals Pointer to variable to receive result.
+ * @param signal_mask Pointer to variable to receive result.
  *
  * @return SP_OK upon success, a negative error code otherwise.
  *
  * @since 0.1.0
  */
-enum sp_return sp_get_signals(struct sp_port *port, enum sp_signal *signals);
+enum sp_return sp_get_signals(struct sp_port *port, enum sp_signal *signal_mask);
 
 /**
  * Put the port transmit line into the break state.