/pidgin/main: 98db0f80d005: Fix PurpleAccountPrefsUiOps build on...
Daniel Atallah
datallah at pidgin.im
Fri Jun 17 21:48:23 EDT 2016
Changeset: 98db0f80d005d3a77bf0615b63f3e2513b00905f
Author: Daniel Atallah <datallah at pidgin.im>
Date: 2016-06-17 21:47 -0400
Branch: release-2.x.y
URL: https://hg.pidgin.im/pidgin/main/rev/98db0f80d005
Description:
Fix PurpleAccountPrefsUiOps build on Windows where we #define rename as wpurple_rename
diffstat:
libpurple/prefs.c | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diffs (15 lines):
diff --git a/libpurple/prefs.c b/libpurple/prefs.c
--- a/libpurple/prefs.c
+++ b/libpurple/prefs.c
@@ -1325,6 +1325,11 @@ purple_prefs_rename(const char *oldname,
{
struct purple_pref *oldpref, *newpref;
+/* win32dep.h causes rename to be defined as wpurple_rename, so we need to undefine it here */
+#if defined(_WIN32) && defined(rename)
+#undef rename
+#endif
+
PURPLE_PREFS_UI_OP_CALL(rename, oldname, newname);
oldpref = find_pref(oldname);
More information about the Commits
mailing list