Fix PurpleAccountPrefsUiOps build on Windows where we #define rename as wpurple_rename release-2.x.y

Fri, 17 Jun 2016 21:47:57 -0400

author
Daniel Atallah <datallah@pidgin.im>
date
Fri, 17 Jun 2016 21:47:57 -0400
branch
release-2.x.y
changeset 37775
98db0f80d005
parent 37758
9aa6de025d0c
child 37776
752e936d11ef

Fix PurpleAccountPrefsUiOps build on Windows where we #define rename as wpurple_rename

libpurple/prefs.c file | annotate | diff | comparison | revisions
--- 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