From 1bb14c3a1df2a9114a892df9bff10b6a2efc3388 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Mon, 27 Feb 2006 09:09:15 +0000
Subject: 64-bit fixes.

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@611 fefdeb5f-60dc-0310-8127-8f9354f1896f
---
 src/polypcore/idxset.c          | 2 +-
 src/polypcore/protocol-esound.c | 2 +-
 src/polypcore/protocol-native.c | 4 ++--
 src/tests/sync-playback.c       | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/polypcore/idxset.c b/src/polypcore/idxset.c
index 8d3a2370..f970ae5e 100644
--- a/src/polypcore/idxset.c
+++ b/src/polypcore/idxset.c
@@ -65,7 +65,7 @@ int pa_idxset_string_compare_func(const void *a, const void *b) {
 }
 
 unsigned pa_idxset_trivial_hash_func(const void *p) {
-    return (unsigned) p;
+    return (unsigned) (long) p;
 }
 
 int pa_idxset_trivial_compare_func(const void *a, const void *b) {
diff --git a/src/polypcore/protocol-esound.c b/src/polypcore/protocol-esound.c
index e30ff067..04fbc3e4 100644
--- a/src/polypcore/protocol-esound.c
+++ b/src/polypcore/protocol-esound.c
@@ -476,7 +476,7 @@ static int esd_proto_all_info(struct connection *c, esd_proto_t request, const v
     uint8_t *response;
     size_t t, k, s;
     struct connection *conn;
-    size_t idx = PA_IDXSET_INVALID;
+    uint32_t idx = PA_IDXSET_INVALID;
     unsigned nsamples;
     assert(c && data && length == sizeof(int));
     
diff --git a/src/polypcore/protocol-native.c b/src/polypcore/protocol-native.c
index 81d91f0c..20ba5131 100644
--- a/src/polypcore/protocol-native.c
+++ b/src/polypcore/protocol-native.c
@@ -799,7 +799,7 @@ static void command_delete_stream(PA_GCC_UNUSED pa_pdispatch *pd, uint32_t comma
 static void command_create_record_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     struct record_stream *s;
-    size_t maxlength, fragment_size;
+    uint32_t maxlength, fragment_size;
     uint32_t source_index;
     const char *name, *source_name;
     pa_sample_spec ss;
@@ -1098,7 +1098,7 @@ static void command_get_record_latency(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UN
 static void command_create_upload_stream(PA_GCC_UNUSED pa_pdispatch *pd, PA_GCC_UNUSED uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata) {
     struct connection *c = userdata;
     struct upload_stream *s;
-    size_t length;
+    uint32_t length;
     const char *name;
     pa_sample_spec ss;
     pa_channel_map map;
diff --git a/src/tests/sync-playback.c b/src/tests/sync-playback.c
index 4ac65c2f..d675e01c 100644
--- a/src/tests/sync-playback.c
+++ b/src/tests/sync-playback.c
@@ -64,7 +64,7 @@ static const pa_buffer_attr buffer_attr = {
 static void nop_free_cb(void *p) {}
 
 static void underflow_cb(struct pa_stream *s, void *userdata) {
-    int i = (int) userdata;
+    int i = (int) (long) userdata;
 
     fprintf(stderr, "Stream %i finished\n", i);
     
@@ -86,7 +86,7 @@ static void stream_state_callback(pa_stream *s, void *userdata) {
 
         case PA_STREAM_READY: {
 
-            int r, i = (int) userdata;
+            int r, i = (int) (long) userdata;
 
             fprintf(stderr, "Writing data to stream %i.\n", i);
             
@@ -136,7 +136,7 @@ static void context_state_callback(pa_context *c, void *userdata) {
             
                 streams[i] = pa_stream_new(c, name, &sample_spec, NULL);
                 assert(streams[i]);
-                pa_stream_set_state_callback(streams[i], stream_state_callback, (void*) i);
+                pa_stream_set_state_callback(streams[i], stream_state_callback, (void*) (long) i);
                 pa_stream_connect_playback(streams[i], NULL, &buffer_attr, PA_STREAM_START_CORKED, NULL, i == 0 ? NULL : streams[0]);
             }
                 
-- 
cgit