[Gaim-commits] CVS: gaim/src/protocols/jabber jabber.c,1.69,1.70 jabber.h,1.2,1.3 lib.h,1.2,1.3

[Luke S. <lsc...@us...>]

Update of /cvsroot/gaim/gaim/src/protocols/jabber
In directory usw-pr-cvs1:/tmp/cvs-serv1570/src/protocols/jabber

Modified Files:
	jabber.c jabber.h lib.h 
Log Message:
rob broke gaim on freebsd. BNeuman told me how to fix it. stupid includes that are
order-sensitive


Index: jabber.c
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- jabber.c	11 Oct 2002 14:19:18 -0000	1.69
+++ jabber.c	13 Oct 2002 15:05:06 -0000	1.70
@@ -24,6 +24,9 @@
 #include <config.h>
 #endif
 
+#include <sys/types.h>
+/*this must happen before sys/socket.h or freebsd won't compile*/
+
 #ifndef _WIN32
 #include <netdb.h>
 #include <netinet/in.h>

Index: jabber.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/jabber.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- jabber.h	11 Oct 2002 03:14:00 -0000	1.2
+++ jabber.h	13 Oct 2002 15:05:06 -0000	1.3
@@ -16,6 +16,10 @@
  *  Jabber
  *  Copyright (C) 1998-1999 The Jabber Team http://jabber.org/
  */
+
+#include <sys/types.h>
+/*this must happen before sys/socket.h or freebsd won't compile*/
+
 #ifndef _WIN32
 #include <syslog.h>
 #include <sys/socket.h>
@@ -31,7 +35,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <stdio.h>
 #include <setjmp.h>
 #include <sys/stat.h>

Index: lib.h
===================================================================
RCS file: /cvsroot/gaim/gaim/src/protocols/jabber/lib.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- lib.h	11 Oct 2002 03:14:00 -0000	1.2
+++ lib.h	13 Oct 2002 15:05:06 -0000	1.3
@@ -2,6 +2,9 @@
 #include <config.h>
 #endif /* HAVE_CONFIG_H */
 
+#include <sys/types.h>
+/*this must happen before sys/socket.h or freebsd won't compile*/
+
 #ifndef _WIN32
 #include <syslog.h>
 #include <strings.h>
@@ -19,7 +22,6 @@
 
 #include <string.h>
 #include <stdlib.h>
-#include <sys/types.h>
 #include <stdio.h>
 #include <setjmp.h>
 #include <sys/stat.h>