changeset 29028:f1437342cc0e

Include 'internal.h' before all other headers to make some non-gcc compilers happy. This in particular impacts Solaris8, where the system headers set _FILE_OFFSET_BITS to 32, even when it's detected by the config scripts as 64. Refs #10523
author Paul Aurich <paul@darkrain42.org>
date Fri, 27 Nov 2009 07:12:35 +0000
parents 9feec7d1d95c
children 1a4b6f47258c
files libpurple/certificate.c libpurple/cmds.c libpurple/dbus-server.c libpurple/debug.c libpurple/desktopitem.c libpurple/eventloop.c libpurple/imgstore.c libpurple/media.c libpurple/mime.c libpurple/nat-pmp.c libpurple/ntlm.c libpurple/plugins/log_reader.c libpurple/plugins/signals-test.c libpurple/protocols/jabber/data.c libpurple/protocols/msn/msn.c libpurple/protocols/msn/object.c libpurple/protocols/myspace/myspace.h libpurple/protocols/novell/nmuser.c libpurple/protocols/oscar/oscar.h libpurple/protocols/qq/buddy_list.c libpurple/protocols/qq/buddy_opt.c libpurple/protocols/qq/char_conv.c libpurple/protocols/qq/qq.h libpurple/protocols/qq/qq_base.c libpurple/protocols/qq/qq_network.c libpurple/protocols/qq/qq_process.c libpurple/protocols/qq/utils.c libpurple/protocols/sametime/sametime.c libpurple/protocols/silc/buddy.c libpurple/protocols/silc/chat.c libpurple/protocols/silc/ft.c libpurple/protocols/silc/ops.c libpurple/protocols/silc/pk.c libpurple/protocols/silc/silc.c libpurple/protocols/silc/util.c libpurple/protocols/silc/wb.c libpurple/roomlist.c libpurple/theme-manager.c libpurple/theme.c libpurple/whiteboard.c libpurple/xmlnode.c pidgin/gtkcertmgr.c pidgin/gtkmedia.c pidgin/gtkwhiteboard.c pidgin/plugins/gtk-signals-test.c
diffstat 45 files changed, 39 insertions(+), 60 deletions(-) [+]
line wrap: on
line diff
--- a/libpurple/certificate.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/certificate.c	Fri Nov 27 07:12:35 2009 +0000
@@ -26,8 +26,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-
 #include "internal.h"
 #include "certificate.h"
 #include "dbus-maybe.h"
--- a/libpurple/cmds.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/cmds.c	Fri Nov 27 07:12:35 2009 +0000
@@ -21,8 +21,6 @@
  *
  */
 
-#include <string.h>
-
 #include "internal.h"
 
 #include "account.h"
--- a/libpurple/dbus-server.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/dbus-server.c	Fri Nov 27 07:12:35 2009 +0000
@@ -25,6 +25,8 @@
 #define DBUS_API_SUBJECT_TO_CHANGE
 #endif
 
+#include "internal.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -42,7 +44,6 @@
 #include "dbus-bindings.h"
 #include "debug.h"
 #include "core.h"
-#include "internal.h"
 #include "savedstatuses.h"
 #include "smiley.h"
 #include "util.h"
--- a/libpurple/debug.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/debug.c	Fri Nov 27 07:12:35 2009 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "prefs.h"
 #include "util.h"
 
--- a/libpurple/desktopitem.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/desktopitem.c	Fri Nov 27 07:12:35 2009 +0000
@@ -53,12 +53,12 @@
  * Boston, MA 02111-1301, USA.
  */
 
+#include "internal.h"
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
 #include <time.h>
 #include "desktopitem.h"
-#include "internal.h"
 
 struct _PurpleDesktopItem {
 	int refcount;
--- a/libpurple/eventloop.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/eventloop.c	Fri Nov 27 07:12:35 2009 +0000
@@ -23,8 +23,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+#include "internal.h"
 #include "eventloop.h"
-#include "internal.h"
 
 static PurpleEventLoopUiOps *eventloop_ui_ops = NULL;
 
--- a/libpurple/imgstore.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/imgstore.c	Fri Nov 27 07:12:35 2009 +0000
@@ -25,7 +25,6 @@
  *
 */
 
-#include <glib.h>
 #include "internal.h"
 
 #include "dbus-maybe.h"
--- a/libpurple/media.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/media.c	Fri Nov 27 07:12:35 2009 +0000
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "internal.h"
 
 #include "account.h"
--- a/libpurple/mime.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/mime.c	Fri Nov 27 07:12:35 2009 +0000
@@ -21,11 +21,6 @@
  * USA.
  */
 
-#include <stdio.h>
-#include <string.h>
-
-#include <glib.h>
-
 #include "internal.h"
 
 /* this should become "util.h" if we ever get this into purple proper */
--- a/libpurple/nat-pmp.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/nat-pmp.c	Fri Nov 27 07:12:35 2009 +0000
@@ -29,8 +29,8 @@
  * OF SUCH DAMAGE.
  */
 
+#include "internal.h"
 #include "nat-pmp.h"
-#include "internal.h"
 #include "debug.h"
 #include "signals.h"
 #include "network.h"
--- a/libpurple/ntlm.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/ntlm.c	Fri Nov 27 07:12:35 2009 +0000
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <stdlib.h>
 #include "internal.h"
 
 #include "util.h"
--- a/libpurple/plugins/log_reader.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/plugins/log_reader.c	Fri Nov 27 07:12:35 2009 +0000
@@ -1,7 +1,7 @@
+#include "internal.h"
+
 #include <stdio.h>
 
-#include "internal.h"
-
 #include "debug.h"
 #include "log.h"
 #include "plugin.h"
--- a/libpurple/plugins/signals-test.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/plugins/signals-test.c	Fri Nov 27 07:12:35 2009 +0000
@@ -20,9 +20,10 @@
  */
 #define SIGNAL_TEST_PLUGIN_ID "core-signals-test"
 
+#include "internal.h"
+
 #include <stdio.h>
 
-#include "internal.h"
 #include "cipher.h"
 #include "connection.h"
 #include "conversation.h"
--- a/libpurple/protocols/jabber/data.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/jabber/data.c	Fri Nov 27 07:12:35 2009 +0000
@@ -18,11 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include <stdlib.h>
 #include <glib.h>
 #include <string.h>
 
-#include "internal.h"
 #include "data.h"
 #include "debug.h"
 #include "xmlnode.h"
--- a/libpurple/protocols/msn/msn.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/msn/msn.c	Fri Nov 27 07:12:35 2009 +0000
@@ -23,8 +23,6 @@
  */
 #define PHOTO_SUPPORT 1
 
-#include <glib.h>
-
 #include "msn.h"
 #include "accountopt.h"
 #include "contact.h"
--- a/libpurple/protocols/msn/object.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/msn/object.c	Fri Nov 27 07:12:35 2009 +0000
@@ -21,6 +21,8 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
+
+#include "msn.h"
 #include "object.h"
 #include "debug.h"
 /* Sha1 stuff */
--- a/libpurple/protocols/myspace/myspace.h	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/myspace/myspace.h	Fri Nov 27 07:12:35 2009 +0000
@@ -20,6 +20,8 @@
 #ifndef _MYSPACE_MYSPACE_H
 #define _MYSPACE_MYSPACE_H
 
+#include "internal.h"
+
 /* Other includes */
 #include <string.h>
 #include <errno.h>/* for EAGAIN */
@@ -36,8 +38,6 @@
 #include <sys/socket.h>
 #endif
 
-#include "internal.h"
-
 #include "notify.h"
 #include "plugin.h"
 #include "accountopt.h"
--- a/libpurple/protocols/novell/nmuser.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/novell/nmuser.c	Fri Nov 27 07:12:35 2009 +0000
@@ -18,9 +18,8 @@
  *
  */
 
-#include <glib.h>
+#include "internal.h"
 #include <string.h>
-#include "internal.h"
 #include "nmfield.h"
 #include "nmuser.h"
 #include "nmconn.h"
--- a/libpurple/protocols/oscar/oscar.h	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Fri Nov 27 07:12:35 2009 +0000
@@ -29,10 +29,10 @@
 #ifndef _OSCAR_H_
 #define _OSCAR_H_
 
+#include "internal.h"
 #include "circbuffer.h"
 #include "debug.h"
 #include "eventloop.h"
-#include "internal.h"
 #include "proxy.h"
 #include "sslconn.h"
 
--- a/libpurple/protocols/qq/buddy_list.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/buddy_list.c	Fri Nov 27 07:12:35 2009 +0000
@@ -22,8 +22,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
-
 #include "qq.h"
 
 #include "debug.h"
--- a/libpurple/protocols/qq/buddy_opt.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/buddy_opt.c	Fri Nov 27 07:12:35 2009 +0000
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "notify.h"
 #include "request.h"
 #include "privacy.h"
--- a/libpurple/protocols/qq/char_conv.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/char_conv.c	Fri Nov 27 07:12:35 2009 +0000
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "char_conv.h"
 #include "packet_parse.h"
--- a/libpurple/protocols/qq/qq.h	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/qq.h	Fri Nov 27 07:12:35 2009 +0000
@@ -25,7 +25,6 @@
 #ifndef _QQ_QQ_H_
 #define _QQ_QQ_H_
 
-#include <glib.h>
 #include "internal.h"
 #include "ft.h"
 #include "circbuffer.h"
--- a/libpurple/protocols/qq/qq_base.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/qq_base.c	Fri Nov 27 07:12:35 2009 +0000
@@ -22,8 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "server.h"
 #include "cipher.h"
 #include "request.h"
--- a/libpurple/protocols/qq/qq_network.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/qq_network.c	Fri Nov 27 07:12:35 2009 +0000
@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "cipher.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "buddy_info.h"
 #include "group_info.h"
--- a/libpurple/protocols/qq/qq_process.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/qq_process.c	Fri Nov 27 07:12:35 2009 +0000
@@ -22,9 +22,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
 #include "cipher.h"
 #include "debug.h"
-#include "internal.h"
 
 #include "buddy_info.h"
 #include "buddy_list.h"
--- a/libpurple/protocols/qq/utils.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/qq/utils.c	Fri Nov 27 07:12:35 2009 +0000
@@ -22,6 +22,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#include "internal.h"
+
 #include "limits.h"
 #include "stdlib.h"
 #include "string.h"
--- a/libpurple/protocols/sametime/sametime.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/sametime/sametime.c	Fri Nov 27 07:12:35 2009 +0000
@@ -21,6 +21,7 @@
   USA.
 */
 
+#include "internal.h"
 
 /* system includes */
 #include <stdlib.h>
@@ -30,9 +31,6 @@
 #include <glib.h>
 
 /* purple includes */
-#include "internal.h"
-#include "config.h"
-
 #include "account.h"
 #include "accountopt.h"
 #include "circbuffer.h"
--- a/libpurple/protocols/silc/buddy.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/buddy.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/chat.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/chat.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/ft.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/ft.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/ops.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/ops.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/pk.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/pk.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/silc.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/silc.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/util.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/util.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/protocols/silc/wb.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/protocols/silc/wb.c	Fri Nov 27 07:12:35 2009 +0000
@@ -17,6 +17,7 @@
 
 */
 
+#include "internal.h"
 #include "silc.h"
 #include "silcclient.h"
 #include "silcpurple.h"
--- a/libpurple/roomlist.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/roomlist.c	Fri Nov 27 07:12:35 2009 +0000
@@ -24,8 +24,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-
 #include "internal.h"
 
 #include "account.h"
--- a/libpurple/theme-manager.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/theme-manager.c	Fri Nov 27 07:12:35 2009 +0000
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <string.h>
-
 #include "internal.h"
 #include "theme-manager.h"
 #include "util.h"
--- a/libpurple/theme.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/theme.c	Fri Nov 27 07:12:35 2009 +0000
@@ -20,9 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <glib.h>
-#include <string.h>
-
 #include "internal.h"
 #include "theme.h"
 #include "util.h"
--- a/libpurple/whiteboard.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/whiteboard.c	Fri Nov 27 07:12:35 2009 +0000
@@ -21,8 +21,6 @@
  *
  */
 
-#include <string.h>
-
 #include "internal.h"
 #include "whiteboard.h"
 #include "prpl.h"
--- a/libpurple/xmlnode.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/libpurple/xmlnode.c	Fri Nov 27 07:12:35 2009 +0000
@@ -29,8 +29,8 @@
  * as I want to be.  Thank you libxode for giving me a good starting point */
 #define _PURPLE_XMLNODE_C_
 
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 
 #include <libxml/parser.h>
 #include <string.h>
--- a/pidgin/gtkcertmgr.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/pidgin/gtkcertmgr.c	Fri Nov 27 07:12:35 2009 +0000
@@ -25,10 +25,8 @@
  *
  */
 
-#include <glib.h>
-
+#include "internal.h"
 #include "core.h"
-#include "internal.h"
 #include "pidgin.h"
 #include "pidginstock.h"
 
--- a/pidgin/gtkmedia.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/pidgin/gtkmedia.c	Fri Nov 27 07:12:35 2009 +0000
@@ -23,9 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
-#include <string.h>
+#include "internal.h"
 #include "debug.h"
-#include "internal.h"
 #include "connection.h"
 #include "media.h"
 #include "mediamanager.h"
--- a/pidgin/gtkwhiteboard.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/pidgin/gtkwhiteboard.c	Fri Nov 27 07:12:35 2009 +0000
@@ -21,8 +21,6 @@
  *
  */
 
-#include <stdlib.h>
-
 #include "internal.h"
 #include "blist.h"
 #include "debug.h"
--- a/pidgin/plugins/gtk-signals-test.c	Thu Nov 26 22:47:53 2009 +0000
+++ b/pidgin/plugins/gtk-signals-test.c	Fri Nov 27 07:12:35 2009 +0000
@@ -20,9 +20,10 @@
  */
 #define GTK_SIGNAL_TEST_PLUGIN_ID "gtk-signals-test"
 
+#include "internal.h"
+
 #include <gtk/gtk.h>
 
-#include "internal.h"
 #include "debug.h"
 #include "version.h"