Imported Upstream version 2.6.1

[debian/amanda] / server-src / taper-source-test.c

diff --git a/server-src/taper-source-test.c b/server-src/taper-source-test.c
index ff731a6f4d52231d31bb62e9075c5ceda7f0af1c..1a39269e7c4adc48dad5e2690c6078bbba61327c 100644 (file)
--- a/server-src/taper-source-test.c
+++ b/server-src/taper-source-test.c
@@ -8,9 +8,9 @@ typedef struct {
 } tape_info_t;
 
 /* A ConsumerFunctor. */
-static int size_limited_consumer(gpointer user_data, queue_buffer_t * buffer) {
+static ssize_t size_limited_consumer(gpointer user_data, queue_buffer_t * buffer) {
     tape_info_t * info = user_data;
-    int result;
+    ssize_t result;
     
     result = info->consumer(info->consumer_data, buffer);
 
@@ -25,7 +25,7 @@ int main(int argc, char ** argv) {
     TaperSource * source;
     tape_info_t info;
     
-    g_type_init();
+    glib_init();
 
     switch (argc) {
     default: