Index: src/internal.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/internal.h,v
retrieving revision 1.11
diff -u -p -r1.11 internal.h
--- src/internal.h	24 Apr 2004 11:58:42 -0000	1.11
+++ src/internal.h	6 Oct 2004 13:53:28 -0000
@@ -118,6 +118,24 @@
 #include "win32dep.h"
 #endif
 
+/* ugly ugly ugly */
+/* This is a workaround for the fact that G_GINT64_MODIFIER and G_GSIZE_FORMAT
+ * are only defined in Glib >= 2.4 */
+#ifndef G_GINT64_MODIFIER
+#	if GLIB_SIZEOF_LONG == 8
+#		define G_GINT64_MODIFIER "l"
+#	else
+#		define G_GINT64_MODIFIER "ll"
+#	endif
+#endif
+
+#ifndef G_GSIZE_FORMAT
+#	if GLIB_SIZEOF_LONG == 8
+#		define G_GSIZE_FORMAT "lu"
+#	else
+#		define G_GSIZE_FORMAT "u"
+#	endif
+#endif
 
 #define GAIM_WEBSITE "http://gaim.sourceforge.net/"
 
Index: src/protocols/msn/directconn.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/msn/directconn.c,v
retrieving revision 1.2.2.2
diff -u -p -r1.2.2.2 directconn.c
--- src/protocols/msn/directconn.c	3 Oct 2004 18:15:07 -0000	1.2.2.2
+++ src/protocols/msn/directconn.c	6 Oct 2004 13:53:28 -0000
@@ -52,14 +52,6 @@ msn_directconn_send_handshake(MsnDirectC
 		guint16 t4;
 		guint64 t5;
 
-		/* ugly ugly ugly */
-#ifndef G_GINT64_MODIFIER
-#	if GLIB_SIZEOF_LONG == 8
-#		define G_GINT64_MODIFIER "l"
-#	else
-#		define G_GINT64_MODIFIER "ll"
-#	endif
-#endif
 		sscanf (directconn->nonce,
 				"%08X-%04hX-%04hX-%04hX-%012" G_GINT64_MODIFIER "X",
 				&t1, &t2, &t3, &t4, &t5);