pidgin: 5e1784d5: Include 'internal.h' before all other he...
darkrain42 at pidgin.im
darkrain42 at pidgin.im
Fri Nov 27 02:20:58 EST 2009
-----------------------------------------------------------------
Revision: 5e1784d5a975dc0726e72521fbf6024dfa281d84
Ancestor: 1b389c32bb4b40f9b7620c2826fcf26304f619c5
Author: darkrain42 at pidgin.im
Date: 2009-11-27T07:12:35
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/5e1784d5a975dc0726e72521fbf6024dfa281d84
Modified 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
ChangeLog:
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
-------------- next part --------------
============================================================
--- libpurple/certificate.c b127df20847fc8116d680e20f5f015f5922cf3be
+++ libpurple/certificate.c 1d1f871a2b65bdf7f9b8541ebb0b772cf6b8fdb5
@@ -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"
============================================================
--- libpurple/cmds.c 210cee32104c954b31dbb1911ac045198af640ac
+++ libpurple/cmds.c f2e052a4f379bb397a19af573c691abf8b8f952b
@@ -21,8 +21,6 @@
*
*/
-#include <string.h>
-
#include "internal.h"
#include "account.h"
============================================================
--- libpurple/dbus-server.c 6c4064f3d222f1c98ffe9c2a1717bf7673227eb2
+++ libpurple/dbus-server.c 53afa37d4f283a31e61180867cd9cb9da84eddc6
@@ -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"
============================================================
--- libpurple/debug.c 5b5d446387f516746ddb8aae9bffbf6e52da1e57
+++ libpurple/debug.c 6784d450303ff60b8713ce1f40c50c13a7f9a309
@@ -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"
============================================================
--- libpurple/desktopitem.c 6ffa6d9f10ee76c57306587e2e43e37a5499f3e1
+++ libpurple/desktopitem.c 2964a4ecc65311d5eabd71cd951adf8492694944
@@ -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;
============================================================
--- libpurple/eventloop.c 723fb0df5965e40f57599f32d72c5cacad6fe2d2
+++ libpurple/eventloop.c d98b9ac615593ed9c4394b7a2e30d1192146c21a
@@ -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;
============================================================
--- libpurple/imgstore.c 80e0dc5f54bc2a4243e4f81ee46c105ffd60bb62
+++ libpurple/imgstore.c 3f6607628ca5a4a105785f2777421b380ab1c009
@@ -25,7 +25,6 @@
*
*/
-#include <glib.h>
#include "internal.h"
#include "dbus-maybe.h"
============================================================
--- libpurple/media.c 0b99988ea2d569de8965dcaeb554ea1eb6d8a542
+++ libpurple/media.c fe1eb5f8a2740b5420fb6f0ac10bd56d8c2b7c56
@@ -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"
============================================================
--- libpurple/mime.c 659dca8b87394ebb1307322ba56b0d684b4a9326
+++ libpurple/mime.c 087654f8fa87af0d3cfed7e480baa1a0299400a8
@@ -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 */
============================================================
--- libpurple/nat-pmp.c bea2db8b874755bb960cfb95a24a4b81847dee8a
+++ libpurple/nat-pmp.c b887eb1179c1c09a7d1544798366959bf65743f9
@@ -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"
============================================================
--- libpurple/ntlm.c 98c6a642a158c154fe361d21a9056016c264fb12
+++ libpurple/ntlm.c 979ce84955ca402858c8ef4fdfb3f786da602d98
@@ -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"
============================================================
--- libpurple/plugins/log_reader.c 1469651d9c1c8cec857fc85c0adc01f66f949e9b
+++ libpurple/plugins/log_reader.c 7459a663a94c0648ae058e3d88933eebd0c06414
@@ -1,6 +1,6 @@
-#include <stdio.h>
+#include "internal.h"
-#include "internal.h"
+#include <stdio.h>
#include "debug.h"
#include "log.h"
============================================================
--- libpurple/plugins/signals-test.c b4552e807a6d52ec1ce60da52f61c7db673ee66e
+++ libpurple/plugins/signals-test.c 2495a23b78976e1ca7b01eda1853fcdd69e7d5b0
@@ -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"
============================================================
--- libpurple/protocols/jabber/data.c 21eab265ddcc9e3640b7839d29e8bc453cf240d7
+++ libpurple/protocols/jabber/data.c 4c95a235de9a85d21be9336e4c9b7c468ee5161d
@@ -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"
============================================================
--- libpurple/protocols/msn/msn.c d435a1ddb0394f78484f94120f6829880efa2db0
+++ libpurple/protocols/msn/msn.c 47bdf05c0a234a66feb0f5bb4af53fccdb08f061
@@ -23,8 +23,6 @@
*/
#define PHOTO_SUPPORT 1
-#include <glib.h>
-
#include "msn.h"
#include "accountopt.h"
#include "contact.h"
============================================================
--- libpurple/protocols/msn/object.c 5b8aedef4f80c61c0188fa9f8dc9615be3ccc7e6
+++ libpurple/protocols/msn/object.c 0f2aece179ef8451e397f8243b64eec2e8bfab43
@@ -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 */
============================================================
--- libpurple/protocols/myspace/myspace.h 5a9e08e0a00f2e192a2b06d60b6e9a64659d6dff
+++ libpurple/protocols/myspace/myspace.h efb20c442cedfb0034fb617a4f2fb298c692fe8b
@@ -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"
============================================================
--- libpurple/protocols/novell/nmuser.c f4154af170b040585796d7b61320b72ef8f19394
+++ libpurple/protocols/novell/nmuser.c 96ba3ff5d3eb21fd0cfb049f760051424e48674d
@@ -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"
============================================================
--- libpurple/protocols/oscar/oscar.h 436f317ca818fbb919ade253926d6f75607cfbde
+++ libpurple/protocols/oscar/oscar.h 83790748947a7bba51c3b03577219777753628af
@@ -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"
============================================================
--- libpurple/protocols/qq/buddy_list.c 9dc41d976f9b110d1a617da43807abe75e2fc793
+++ libpurple/protocols/qq/buddy_list.c 1ee8e7770fdb8cafa6344dbe64df81bbb0820363
@@ -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"
============================================================
--- libpurple/protocols/qq/buddy_opt.c 543ee863cdda7025b0bbf7f9cdf00cd3ad04981a
+++ libpurple/protocols/qq/buddy_opt.c 848b326515a6930b8a3ecb514aacaeaaae8ddb82
@@ -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"
============================================================
--- libpurple/protocols/qq/char_conv.c 9f3691f7dcba0166a9bd35262904439b1de7d6ec
+++ libpurple/protocols/qq/char_conv.c d9ceaac50ebda9a6adacf8da27d76ed0847d90ba
@@ -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"
============================================================
--- libpurple/protocols/qq/qq.h 3d091bca4889c327acc9af50a8a39466ba316a60
+++ libpurple/protocols/qq/qq.h b4ed69040d76f7b8a3bd5a0c1f0c1607bbac786a
@@ -25,7 +25,6 @@
#ifndef _QQ_QQ_H_
#define _QQ_QQ_H_
-#include <glib.h>
#include "internal.h"
#include "ft.h"
#include "circbuffer.h"
============================================================
--- libpurple/protocols/qq/qq_base.c 0a423713841bc1492cff2b78864861925eb0afad
+++ libpurple/protocols/qq/qq_base.c e5dd8ef10e99043103acced8a42c982a23fe6f86
@@ -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"
============================================================
--- libpurple/protocols/qq/qq_network.c cc2887d2fe3adcba094d11b0cc43522b13c49276
+++ libpurple/protocols/qq/qq_network.c d49f20c9c919b84db74bf7bdd980e0ca77d9f1e5
@@ -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"
============================================================
--- libpurple/protocols/qq/qq_process.c 2cb707bcd39e9f20df16ae5d4f7de1fb63d7542d
+++ libpurple/protocols/qq/qq_process.c 4503b858f8671cd630ff35226bd50dd01215b907
@@ -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"
============================================================
--- libpurple/protocols/qq/utils.c b5b0e40b2d3a9778dccc3b573d02f81b9a39efeb
+++ libpurple/protocols/qq/utils.c 684e52bf9e09207844207a3e05e06bc64af91e97
@@ -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"
============================================================
--- libpurple/protocols/sametime/sametime.c 4951653f013dc91cbf7c5c757e2aa443c52a8612
+++ libpurple/protocols/sametime/sametime.c b37d0723ce3d8f8dc2891b13dba156d63173a018
@@ -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"
============================================================
--- libpurple/protocols/silc/buddy.c 519ae809142e0953c2e56021312541de01787ccc
+++ libpurple/protocols/silc/buddy.c a3818d77b94aa7ea041fffd92b90f264a1649f93
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/protocols/silc/chat.c fabe936dde280f66eef08d8aafd8021d0162ff79
+++ libpurple/protocols/silc/chat.c 63b024a39575abc0aaef1105cacfdb8a26ec3b74
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/protocols/silc/ft.c 8453accf89e77babc98477f9c0ec6e55e926b801
+++ libpurple/protocols/silc/ft.c cf0beb6d503ea6d119fbd40ad2ffd6e9dab0e0e1
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/protocols/silc/ops.c 917d7cfe9bd5fff8c6f9b0d104e54eacbb09f428
+++ libpurple/protocols/silc/ops.c 059a32c4558a3423b05562b96b38115840e5e8f6
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/protocols/silc/pk.c 00efb4b50b54c290d371f1ae587578e6a09686ab
+++ libpurple/protocols/silc/pk.c 124760e306d7f6f8021b7be37b9d41eeadefe022
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/protocols/silc/silc.c e3cf2c2a73dda7a0f719883e805da6a454d3e2dc
+++ libpurple/protocols/silc/silc.c 5c9820adb5a6c54551b37ba03044b77a88eefbce
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/protocols/silc/util.c 20b5a87318a6f38c763cb22f4415c8e26dfa77b8
+++ libpurple/protocols/silc/util.c 2ae622a1858070722f4052b0755ce0a115d06b53
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/protocols/silc/wb.c 64ff9cef2bcb14c5d2c602cc051c1c698492f319
+++ libpurple/protocols/silc/wb.c 124f1418b551e542510b735c15167d0ed274b23b
@@ -17,6 +17,7 @@
*/
+#include "internal.h"
#include "silc.h"
#include "silcclient.h"
#include "silcpurple.h"
============================================================
--- libpurple/roomlist.c c01e0a6a6ae18750b712cea63afbe192476b5eea
+++ libpurple/roomlist.c 1946bbe953c69bdf2acfa1ebd0690d908287cbcc
@@ -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"
============================================================
--- libpurple/theme-manager.c 150bfc0f75170dfa795b5c4ce7e8b4bfc7774db4
+++ libpurple/theme-manager.c 187b4a55f08a2bb2fb4ef5190c427424e7fe7aa8
@@ -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"
============================================================
--- libpurple/theme.c cec73a4adf7071e3215d0dca2f6ca5b002adbfa1
+++ libpurple/theme.c 562727889d220926e36d1282c0ae82e921a4dc2a
@@ -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"
============================================================
--- libpurple/whiteboard.c a4708cc57ac7fa0796f4653663de5f055b9576d4
+++ libpurple/whiteboard.c f0b3552b97ebdb869cdbc32342f6e010028d707e
@@ -21,8 +21,6 @@
*
*/
-#include <string.h>
-
#include "internal.h"
#include "whiteboard.h"
#include "prpl.h"
============================================================
--- libpurple/xmlnode.c 011cb66e1f2478b329af74e53f864ed7fdf32369
+++ libpurple/xmlnode.c 807040ba848b14a6ce37b38355aa9cd85925d435
@@ -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>
============================================================
--- pidgin/gtkcertmgr.c ab17d6fb5dd2ac6d7a213f3b1395f59593ec6d7f
+++ pidgin/gtkcertmgr.c 9bc0babab03962ca023733767603d5753008612d
@@ -25,10 +25,8 @@
*
*/
-#include <glib.h>
-
+#include "internal.h"
#include "core.h"
-#include "internal.h"
#include "pidgin.h"
#include "pidginstock.h"
============================================================
--- pidgin/gtkmedia.c e11fc02604ea58e718b2d34561d5d5afedb08c5a
+++ pidgin/gtkmedia.c 6934f159f9fe22438a05c666f73ba55a8afdf959
@@ -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"
============================================================
--- pidgin/gtkwhiteboard.c 8122e71b0b51b512e6b35af47165448ae1b7afba
+++ pidgin/gtkwhiteboard.c f9e44e075e85b4795313a935bed5ccf6ab736c12
@@ -21,8 +21,6 @@
*
*/
-#include <stdlib.h>
-
#include "internal.h"
#include "blist.h"
#include "debug.h"
============================================================
--- pidgin/plugins/gtk-signals-test.c bc65cc0262217161cbed19ef2f9df5ce06511e17
+++ pidgin/plugins/gtk-signals-test.c 450f5bbe1163a08be446b00c829f80e9ea497fe1
@@ -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"
More information about the Commits
mailing list