* todo update

* lirc warning fix
* c++ compat


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@336 fefdeb5f-60dc-0310-8127-8f9354f1896f

1 files changed, 5 insertions, 5 deletions

diff --git a/polyp/polyplib-introspect.h b/polyp/polyplib-introspect.h
index ba9bde3c..83cdba16 100644
--- a/polyp/polyplib-introspect.h
+++ b/polyp/polyplib-introspect.h
@@ -58,7 +58,7 @@ struct pa_sink_info {
     uint32_t monitor_source;           /**< Index of the monitor source connected to this sink */
     const char *monitor_source_name;   /**< The name of the monitor source */
     pa_usec_t latency;                 /**< Length of filled playback buffer of this sink */
-    pa_typeid_t typeid;                /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a sink by its name */
@@ -80,7 +80,7 @@ struct pa_source_info {
     uint32_t monitor_of_sink;           /**< If this is a monitor source the index of the owning sink, otherwise PA_INVALID_INDEX */
     const char *monitor_of_sink_name;   /**< Name of the owning sink, or PA_INVALID_INDEX */
     pa_usec_t latency;                  /**< Length of filled record buffer of this source. \since 0.5 */
-    pa_typeid_t typeid;                /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a source by its name */
@@ -127,7 +127,7 @@ struct pa_client_info {
     uint32_t index;                      /**< Index of this client */
     const char *name;                    /**< Name of this client */
     uint32_t owner_module;               /**< Index of the owning module, or PA_INVALID_INDEX */
-    pa_typeid_t typeid;                  /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                  /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a client by its index */
@@ -148,7 +148,7 @@ struct pa_sink_input_info {
     pa_usec_t buffer_usec;               /**< Latency due to buffering in sink input, see pa_latency_info for details */
     pa_usec_t sink_usec;                 /**< Latency of the sink device, see pa_latency_info for details */
     const char *resample_method;         /**< Thre resampling method used by this sink input. \since 0.7 */
-    pa_typeid_t typeid;                  /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                 /**< Implementation type. \since 0.8 */
 };
 
 /** Get some information about a sink input by its index */
@@ -168,7 +168,7 @@ struct pa_source_output_info {
     pa_usec_t buffer_usec;               /**< Latency due to buffering in the source output, see pa_latency_info for details. \since 0.5 */
     pa_usec_t source_usec;               /**< Latency of the source device, see pa_latency_info for details. \since 0.5 */
     const char *resample_method;         /**< Thre resampling method used by this source output. \since 0.7 */
-    pa_typeid_t typeid;                  /**< Implementation type. \since 0.8 */
+    pa_typeid_t _typeid;                  /**< Implementation type. \since 0.8 */
 };
 
 /** Get information about a source output by its index */