Merge commit 'elmarco/master'

2 files changed, 2 insertions, 2 deletions

diff --git a/src/pulse/def.h b/src/pulse/def.h
index ace56574..7a715b66 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -428,7 +428,7 @@ typedef enum pa_subscription_event_type {
     PA_SUBSCRIPTION_EVENT_REMOVE = 0x0020U,
     /**< An object was removed */
 
-    PA_SUBSCRIPTION_EVENT_TYPE_MASK = 0x0030U,
+    PA_SUBSCRIPTION_EVENT_TYPE_MASK = 0x0030U
     /**< A mask to extract the event operation from an event value */
 
 } pa_subscription_event_type_t;
diff --git a/src/pulse/proplist.c b/src/pulse/proplist.c
index eec9d310..60a92d44 100644
--- a/src/pulse/proplist.c
+++ b/src/pulse/proplist.c
@@ -359,7 +359,7 @@ pa_proplist *pa_proplist_from_string(const char *str) {
             }
 
             blob = pa_xmalloc((size_t)(e-v)/2);
-            if (pa_parsehex(v, blob, (e-v)/2) != ((e-v)/2)) {
+            if (pa_parsehex(v, blob, (e-v)/2) != (size_t)((e-v)/2)) {
                 pa_log("Invalid \"hex:\" value data");
                 pa_xfree(blob);
                 break;