# HG changeset patch
# User Daniel Atallah <daniel.atallah@gmail.com>
# Date 1314396788 0
# Node ID cca6cd8975ef06b371fa413b162b8c380b6443e7
# Parent  e5e81ce9c56431f471e1dfbe74e7c4d58d89a143# Parent  36dbba5833da7d3f54d8535382c460bfc90d2bd8
merge of '3849acda3c84d7798c514bc1a9f80cca6674e52c'
     and 'c2c0e69d4f4081d4e5c60c2bab7b1a3e6d2f896a'

diff -r e5e81ce9c564 -r cca6cd8975ef libpurple/win32/libc_interface.c
--- a/libpurple/win32/libc_interface.c	Fri Aug 26 21:25:25 2011 +0000
+++ b/libpurple/win32/libc_interface.c	Fri Aug 26 22:13:08 2011 +0000
@@ -467,12 +467,6 @@
 	return res;
 }
 
-/* stdio.h */
-
-int wpurple_rename (const char *oldname, const char *newname) {
-	return g_rename(oldname, newname);
-}
-
 /* time.h */
 
 struct tm * wpurple_localtime_r (const time_t *time, struct tm *resultp) {
diff -r e5e81ce9c564 -r cca6cd8975ef libpurple/win32/libc_interface.h
--- a/libpurple/win32/libc_interface.h	Fri Aug 26 21:25:25 2011 +0000
+++ b/libpurple/win32/libc_interface.h	Fri Aug 26 22:13:08 2011 +0000
@@ -135,7 +135,7 @@
 #define vsnprintf _vsnprintf
 
 #define rename( oldname, newname ) \
-wpurple_rename( oldname, newname )
+g_rename( oldname, newname )
 
 /* sys/stat.h */
 #define fchmod(a,b)
diff -r e5e81ce9c564 -r cca6cd8975ef libpurple/win32/libc_internal.h
--- a/libpurple/win32/libc_internal.h	Fri Aug 26 21:25:25 2011 +0000
+++ b/libpurple/win32/libc_internal.h	Fri Aug 26 22:13:08 2011 +0000
@@ -141,9 +141,6 @@
 int wpurple_gethostname(char *name, size_t size);
 
 
-/* stdio.h */
-int wpurple_rename(const char *oldname, const char *newname);
-
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */