Clean up `Perl_sv_2pv' warnings on LP64.

2 files changed, 180 insertions, 1 deletions

diff --git a/chat/xchat/distinfo b/chat/xchat/distinfo
index 342d61eae43..a49eed7142f 100644
--- a/chat/xchat/distinfo
+++ b/chat/xchat/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2002/06/06 12:31:27 tron Exp $
+$NetBSD: distinfo,v 1.15 2002/07/19 05:22:51 mycroft Exp $
 
 SHA1 (xchat-1.8.9.tar.bz2) = feb8dab8dab8170586ff18caa09fe510ba0a4d46
 Size (xchat-1.8.9.tar.bz2) = 747762 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 86bcdaf1ccd33d64fc44583eec39e192dfcba06d
 SHA1 (patch-ab) = 416a335b6e8d77a61fddabc823d77e3151dc359d
 SHA1 (patch-ac) = 10dce1c565b8d95fd6b4941ddb1fbf7bb82e52ed
 SHA1 (patch-ad) = 7453ab165db9c166dae6221f80884de8de7511a7
+SHA1 (patch-ae) = baee878728bb33317258e43919ccabfcf3fd2f4a
diff --git a/chat/xchat/patches/patch-ae b/chat/xchat/patches/patch-ae
new file mode 100644
index 00000000000..95e0cf344bf
--- /dev/null
+++ b/chat/xchat/patches/patch-ae
@@ -0,0 +1,178 @@
+$NetBSD: patch-ae,v 1.3 2002/07/19 05:22:52 mycroft Exp $
+
+--- src/common/perl.c.orig	Fri Jul 19 05:14:48 2002
++++ src/common/perl.c	Fri Jul 19 05:15:59 2002
+@@ -256,7 +256,8 @@
+ execute_perl (char *function, char *args)
+ {
+ 	char *perl_args[2] = { args, NULL }, buf[512];
+-	int count, ret_value = 1;
++	int ret_value = 1;
++	STRLEN count;
+ 	SV *sv;
+ 
+ 	dSP;
+@@ -273,7 +274,7 @@
+ 		POPs;
+ 	} else if (count != 1) {
+ 		snprintf(buf, 512, "Perl error: expected 1 value from %s, "
+-			"got: %d\n", function, count);
++			"got: %ld\n", function, (long)count);
+ 		PrintText(perl_sess, buf);
+ 	} else {
+ 		ret_value = POPi;
+@@ -656,7 +657,7 @@
+ static XS (XS_IRC_register)
+ {
+ 	char *name, *ver, *callback, *unused;
+-	int junk;
++	STRLEN junk;
+ 	struct perlscript *scp;
+ 	dXSARGS;
+ 
+@@ -680,7 +681,7 @@
+ /* IRC::main_print(output) */
+ static XS (XS_IRC_print)
+ {
+-	int junk;
++	STRLEN junk;
+ 	int i;
+ 	char *output;
+ 	dXSARGS;
+@@ -706,7 +707,7 @@
+ 
+ static XS (XS_IRC_print_with_channel)
+ {
+-	int junk;
++	STRLEN junk;
+ 	char *output;
+ 	struct session *sess;
+ 	GSList *list = sess_list;
+@@ -784,7 +785,7 @@
+ /* IRC::get_prefs(var) */
+ static XS (XS_IRC_get_prefs)
+ {
+-	int junk;
++	STRLEN junk;
+ 	char *var;
+ 	int i = 0;
+ 	dXSARGS;
+@@ -827,7 +828,7 @@
+ /* IRC::add_message_handler(message_type, handler_name) */
+ static XS (XS_IRC_add_message_handler)
+ {
+-	int junk;
++	STRLEN junk;
+ 	struct _perl_inbound_handlers *handler;
+ 	dXSARGS;
+ 
+@@ -842,7 +843,7 @@
+ /* IRC::add_command_handler(command_name, handler_name) */
+ static XS (XS_IRC_add_command_handler)
+ {
+-	int junk;
++	STRLEN junk;
+ 	struct _perl_command_handlers *handler;
+ 	dXSARGS;
+ 
+@@ -857,7 +858,7 @@
+ /* IRC::add_print_handler(print_name, handler_name) */
+ static XS (XS_IRC_add_print_handler)
+ {
+-	int junk;
++	STRLEN junk;
+ 	struct _perl_print_handlers *handler;
+ 	dXSARGS;
+ 
+@@ -870,7 +871,7 @@
+ 
+ static XS (XS_IRC_add_timeout_handler)
+ {
+-	int junk;
++	STRLEN junk;
+ 	struct _perl_timeout_handlers *handler;
+ 	dXSARGS;
+ 
+@@ -886,7 +887,7 @@
+ static XS (XS_IRC_send_raw)
+ {
+ 	char *data;
+-	int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 
+ 	if (perl_sess)
+@@ -1033,7 +1034,7 @@
+ 
+ static XS (XS_IRC_user_info)
+ {
+-	int junk;
++	STRLEN junk;
+ 	struct User *user;
+ 	char *nick;
+ 	dXSARGS;
+@@ -1065,7 +1066,7 @@
+  */
+ static XS (XS_IRC_add_user_list)
+ {
+-	int junk;
++	STRLEN junk;
+ 	char *ul_channel;
+ 	char *ul_server;
+ 	char *nick;
+@@ -1104,7 +1105,7 @@
+  */
+ static XS (XS_IRC_sub_user_list)
+ {
+-	int junk;
++	STRLEN junk;
+ 	char *channel;
+ 	char *server;
+ 	char *nick;
+@@ -1135,7 +1136,7 @@
+  */
+ static XS (XS_IRC_clear_user_list)
+ {
+-	int junk;
++	STRLEN junk;
+ 	char *channel, *server;
+ 	struct session *sess;
+ 	GSList *list = sess_list;
+@@ -1170,7 +1171,8 @@
+ 	struct session *sess;
+ 	char *channel, *server;
+ 	GSList *list = sess_list;
+-	int i = 0, junk;
++	int i = 0;
++	STRLEN junk;
+ 	int MinStk = 10;
+ 	dXSARGS;
+ 
+@@ -1267,7 +1269,7 @@
+ static XS (XS_IRC_command)
+ {
+ 	char *command;
+-	int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 
+ 	if (perl_sess)
+@@ -1284,7 +1286,7 @@
+ 	GSList *list = serv_list;
+ 	struct server *serv;
+ 	char *server, *command;
+-	int junk;
++	STRLEN junk;
+ 	dXSARGS;
+ 
+ 	server = strdup (SvPV (ST (1), junk));
+@@ -1338,7 +1340,8 @@
+ 	struct session *sess;
+ 	char *channel, *server;
+ 	GSList *list = sess_list;
+-	int i = 0, junk;
++	int i = 0;
++	STRLEN junk;
+ 	int MinStk = 10;
+ 	dXSARGS;
+