Mercurial > pidgin
changeset 3664:1a6d3f3bc682
[gaim-migrate @ 3793]
rob broke gaim on freebsd. BNeuman told me how to fix it. stupid includes that are
order-sensitive
committer: Tailor Script <tailor@pidgin.im>
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Sun, 13 Oct 2002 15:05:06 +0000 |
| parents | de747789934f |
| children | 7cb6cf20ed7d |
| files | src/protocols/jabber/jabber.c src/protocols/jabber/jabber.h src/protocols/jabber/lib.h src/protocols/oscar/oscar.c src/proxy.h |
| diffstat | 5 files changed, 16 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/protocols/jabber/jabber.c Sun Oct 13 08:58:51 2002 +0000 +++ b/src/protocols/jabber/jabber.c Sun Oct 13 15:05:06 2002 +0000 @@ -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>
--- a/src/protocols/jabber/jabber.h Sun Oct 13 08:58:51 2002 +0000 +++ b/src/protocols/jabber/jabber.h Sun Oct 13 15:05:06 2002 +0000 @@ -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>
--- a/src/protocols/jabber/lib.h Sun Oct 13 08:58:51 2002 +0000 +++ b/src/protocols/jabber/lib.h Sun Oct 13 15:05:06 2002 +0000 @@ -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>
--- a/src/protocols/oscar/oscar.c Sun Oct 13 08:58:51 2002 +0000 +++ b/src/protocols/oscar/oscar.c Sun Oct 13 15:05:06 2002 +0000 @@ -25,6 +25,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>
--- a/src/proxy.h Sun Oct 13 08:58:51 2002 +0000 +++ b/src/proxy.h Sun Oct 13 15:05:06 2002 +0000 @@ -26,6 +26,9 @@ #ifndef _PROXY_H_ #define _PROXY_H_ +#include <sys/types.h> +/*this must happen before sys/socket.h or freebsd won't compile*/ + #ifndef _WIN32 #include <sys/socket.h> #include <netdb.h> @@ -34,7 +37,6 @@ #include <winsock.h> #endif -#include <sys/types.h> #include <glib.h> #define PROXY_NONE 0