changeset 8907:00138e366ef8

[gaim-migrate @ 9677] " Fixes a few warnings on 64bit machines. Also fixes yahoo auth on 64bit machines which would have taken me awhile if marv didn't point me in the right direction. I've applied to my local 32bit copy and everything seems to be working fine." --Gary Kramlich committer: Tailor Script <[e-mail]>

--- a/src/gtkimhtml.c	Sat May 08 18:37:00 2004 +0000
+++ b/src/gtkimhtml.c	Sat May 08 23:34:30 2004 +0000
@@ -553,7 +553,7 @@
 	primary = gtk_widget_get_clipboard(GTK_WIDGET(imhtml), GDK_SELECTION_PRIMARY) == clipboard;
 
 	if (info == TARGET_HTML) {
-		int len;
+		gsize len;
 		char *selection;
 		GString *str = g_string_new(NULL);
 		if (primary) {

--- a/src/protocols/oscar/oscar.c	Sat May 08 18:37:00 2004 +0000
+++ b/src/protocols/oscar/oscar.c	Sat May 08 23:34:30 2004 +0000
@@ -5626,7 +5626,7 @@
 	char *buf, *buf2;
 	char *charset = NULL;
 	int encoding;
-	int len;
+	gsize len;
 
 	if (!(conv = gaim_find_chat(gc, id)))
 		return -EINVAL;

--- a/src/sha.h	Sat May 08 18:37:00 2004 +0000
+++ b/src/sha.h	Sat May 08 23:34:30 2004 +0000
@@ -1,22 +1,41 @@
-#if (SIZEOF_INT == 4)
-typedef unsigned int uint32;
-#elif (SIZEOF_SHORT == 4)
-typedef unsigned short uint32;
-#else
-typedef unsigned int uint32;
-#endif /* HAVEUINT32 */
- 
+/* 
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is SHA 180-1 Reference Implementation (Compact version)
+ * 
+ * The Initial Developer of the Original Code is Paul Kocher of
+ * Cryptography Research.  Portions created by Paul Kocher are 
+ * Copyright (C) 1995-9 by Cryptography Research, Inc.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ *
+ */
+#ifndef _SHA_H_
+#define _SHA_H_
+
+#include <glib.h>
+
+typedef struct {
+	guint32 H[5];
+ 	guint32 W[80];
+	int lenW;
+	guint32 sizeHi;
+	guint32 sizeLo;
+} SHA_CTX;
+
 int strprintsha(char *dest, int *hashval);
- 
-typedef struct {
-  unsigned long H[5];
-  unsigned long W[80];
-  int lenW;
-  unsigned long sizeHi,sizeLo;
-} SHA_CTX;
- 
 void shaInit(SHA_CTX *ctx);
 void shaUpdate(SHA_CTX *ctx, unsigned char *dataIn, int len);
 void shaFinal(SHA_CTX *ctx, unsigned char hashout[20]);
 void shaBlock(unsigned char *dataIn, int len, unsigned char hashout[20]);
-                                                                                                         
+
+#endif

--- a/src/util.c	Sat May 08 18:37:00 2004 +0000
+++ b/src/util.c	Sat May 08 23:34:30 2004 +0000
@@ -302,7 +302,8 @@
 
 	for (unencoded = cur = str; (encoded = cur = strstr(cur, "=?")); unencoded = cur) {
 		gboolean found_word = FALSE;
-		int i, num, len, dec_len;
+		int i, num, dec_len;
+		gsize len;
 		char *decoded, *converted;
 		char *tokens[3];