Mercurial > pidgin.yaz

diff libpurple/win32/win32dep.h @ 22709:1cd99421c696

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Include winsock2.h before windows.h is included to avoid winsock.h being included. Also, rename and staticify a variable in our copy of giowin32.c so it doesn't conflict with the one extern'ed in the glib headers.
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 25 Apr 2008 15:48:33 +0000
parents 322b92e28005
children 54eb782d4721
line wrap: on
line diff
--- a/libpurple/win32/win32dep.h	Fri Apr 25 15:37:21 2008 +0000
+++ b/libpurple/win32/win32dep.h	Fri Apr 25 15:48:33 2008 +0000
@@ -22,8 +22,9 @@
  */
 #ifndef _WIN32DEP_H_
 #define _WIN32DEP_H_
+#include <winsock2.h>
+#include <windows.h>
 #include <shlobj.h>
-#include <winsock2.h>
 #include <process.h>
 #include "wpurpleerror.h"
 #include "libc_interface.h"