pidgin/android/libpurple

0f4b2e3ac978
Parents fb896f14715b
Children df88eed08123
win32: fix all warnings about improper winsock2.h include point
--- a/pidgin/gtkconv-theme.c Wed Apr 17 22:16:09 2013 +0200
+++ b/pidgin/gtkconv-theme.c Wed Apr 17 23:57:53 2013 +0200
@@ -20,6 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*/
+#include "internal.h"
+
#include "gtkconv-theme.h"
#include "conversation.h"
@@ -28,7 +30,6 @@
#include "xmlnode.h"
#include "pidgin.h"
-#include "internal.h"
#include "gtkconv.h"
#include "gtkwebview.h"
--- a/pidgin/plugins/win32/winprefs/winprefs.c Wed Apr 17 22:16:09 2013 +0200
+++ b/pidgin/plugins/win32/winprefs/winprefs.c Wed Apr 17 23:57:53 2013 +0200
@@ -20,9 +20,6 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301 USA
*
*/
-#include <gtk/gtk.h>
-#include <gdk/gdkwin32.h>
-
#include "internal.h"
#include "gtkwin32dep.h"
--- a/pidgin/win32/gtkwin32dep.c Wed Apr 17 22:16:09 2013 +0200
+++ b/pidgin/win32/gtkwin32dep.c Wed Apr 17 23:57:53 2013 +0200
@@ -25,7 +25,9 @@
#ifndef WINVER
#define WINVER 0x0500 /* W2K */
#endif
-#include <windows.h>
+
+#include "internal.h"
+
#include <io.h>
#include <stdlib.h>
#include <stdio.h>
@@ -36,8 +38,6 @@
#include <gtk/gtk.h>
#include <gdk/gdkwin32.h>
-#include "internal.h"
-
#include "debug.h"
#include "notify.h"
#include "network.h"
--- a/pidgin/win32/wspell.c Wed Apr 17 22:16:09 2013 +0200
+++ b/pidgin/win32/wspell.c Wed Apr 17 23:57:53 2013 +0200
@@ -27,7 +27,6 @@
#include <config.h>
#endif
#ifdef USE_GTKSPELL
-#include <windows.h>
#include <string.h>
#include <stdlib.h>
#include <glib.h>