# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1210558620 0
# Node ID da022013ec2a04a91cf6e9128a4b1e81860e4537
# Parent  3f9877080462df89aeb3878bf8cd87ac18002aad
MSVC build fixes

diff -r 3f9877080462 -r da022013ec2a libpurple/protocols/jabber/win32/posix.uname.c
--- a/libpurple/protocols/jabber/win32/posix.uname.c	Mon May 12 02:13:40 2008 +0000
+++ b/libpurple/protocols/jabber/win32/posix.uname.c	Mon May 12 02:17:00 2008 +0000
@@ -33,10 +33,12 @@
 /*#define _ANONYMOUS_STRUCT*/
 /*#define _ANONYMOUS_UNION*/
 #include <windows.h>
+#ifdef __MINGW32__
 #include <_mingw.h>
+#endif
 
 int
-uname( struct utsname *uts )
+jabber_win32_uname( struct utsname *uts )
 {
   DWORD sLength;
   OSVERSIONINFO OS_version;
@@ -52,7 +54,7 @@
   GetVersionEx ( &OS_version );
   GetSystemInfo ( &System_Info );
 
-  strcpy( uts->sysname, "MINGW_" );
+  strcpy( uts->sysname, "WIN32_" );
   switch( OS_version.dwPlatformId )
   {
     case VER_PLATFORM_WIN32_NT:
@@ -82,8 +84,10 @@
       break;
   }
 
+#ifdef __MINGW32__
   sprintf( uts->version, "%i", __MINGW32_MAJOR_VERSION );
   sprintf( uts->release, "%i", __MINGW32_MINOR_VERSION );
+#endif
 
   switch( System_Info.wProcessorArchitecture )
   {
diff -r 3f9877080462 -r da022013ec2a libpurple/protocols/jabber/win32/utsname.h
--- a/libpurple/protocols/jabber/win32/utsname.h	Mon May 12 02:13:40 2008 +0000
+++ b/libpurple/protocols/jabber/win32/utsname.h	Mon May 12 02:17:00 2008 +0000
@@ -14,7 +14,8 @@
   char machine[20];
 };
 
-int uname (struct utsname *);
+int jabber_win32_uname (struct utsname *);
+#define uname(utsname) jabber_win32_uname(utsname)
 
 #ifdef __cplusplus
 }