Imported Upstream version 2.6.1

[debian/amanda] / device-src / activate-devpay.c

diff --git a/device-src/activate-devpay.c b/device-src/activate-devpay.c
index 196834d6cf03b1f20e32b8886ea7bd24bfa58faf..9563071d70d78fd10e3fd4a4697b8c779b24dc99 100644 (file)
--- a/device-src/activate-devpay.c
+++ b/device-src/activate-devpay.c
@@ -13,10 +13,6 @@
 #include "base64.h"
 #include "s3.h"
 
-#ifndef WANT_DEVPAY
-# error activate_devpay only works if devpay is enabled.
-#endif
-
 #define MAX_RESPONSE_SIZE (1024*1024)
 
 typedef struct {
@@ -147,7 +143,7 @@ static void parser_got_text(GMarkupParseContext * context,
             /* Do nothing; wait for the message. */
         }
     } else if (g_strrstr(current_tag, "Message")) {
-        g_set_error(error, G_MARKUP_ERROR, -1, "%.*s", text_len, text);
+        g_set_error(error, G_MARKUP_ERROR, -1, "%.*s", (int)text_len, text);
     }
 }