libpurple/prefs.c

branch
release-2.x.y
changeset 37775
98db0f80d005
parent 37750
c3548438b3a8
child 37901
41e45e18f3b2
child 40764
d687fda4047d
--- a/libpurple/prefs.c	Thu Jun 16 23:52:59 2016 -0500
+++ b/libpurple/prefs.c	Fri Jun 17 21:47:57 2016 -0400
@@ -1325,6 +1325,11 @@
 {
 	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);

mercurial