merged in upstream r379 (somewhere after 1.2-3).

Just one trivial conflict in the jabber Makefile, went smoothly.

1 files changed, 6 insertions, 2 deletions

diff --git a/lib/arc.h b/lib/arc.h
index 882372ed..816fa612 100644
--- a/lib/arc.h
+++ b/lib/arc.h
@@ -30,7 +30,11 @@ struct arc_state
 	unsigned char i, j;
 };
 
-struct arc_state *arc_keymaker( unsigned char *key, int kl, int cycles );
+#ifndef G_GNUC_MALLOC
+#define G_GNUC_MALLOC
+#endif
+
+G_GNUC_MALLOC struct arc_state *arc_keymaker( unsigned char *key, int kl, int cycles );
 unsigned char arc_getbyte( struct arc_state *st );
-int arc_encode( char *clear, int clear_len, unsigned char **crypt, char *password );
+int arc_encode( char *clear, int clear_len, unsigned char **crypt, char *password, int pad_to );
 int arc_decode( unsigned char *crypt, int crypt_len, char **clear, char *password );