Mercurial > pidgin
changeset 31976:cca6cd8975ef
merge of '3849acda3c84d7798c514bc1a9f80cca6674e52c'
and 'c2c0e69d4f4081d4e5c60c2bab7b1a3e6d2f896a'
| author | Daniel Atallah <daniel.atallah@gmail.com> |
|---|---|
| date | Fri, 26 Aug 2011 22:13:08 +0000 |
| parents | e5e81ce9c564 (current diff) 36dbba5833da (diff) |
| children | 50cdd401274a |
| files | |
| diffstat | 3 files changed, 1 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- 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) {
--- 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)
--- 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 */