Fix possible conflict of 'tmp' variable name in setptr macro.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@1914 ea778897-0a13-0410-b9d1-a72fbfd435f5

src/keyfile.c

@@ -624,7 +624,7 @@ static void load_ui_prefs(GKeyFile *config)
 		{
 			if (ui_prefs.geometry[i] < -1)
 				ui_prefs.geometry[i] = -1;
-		}		
+		}
 	}
 	hpan_position = utils_get_setting_integer(config, PACKAGE, "treeview_position", 156);
 	vpan_position = utils_get_setting_integer(config, PACKAGE, "msgwindow_position", (geo) ?

src/utils.h

@@ -34,9 +34,9 @@
  * It prevents a memory leak compared with: ptr = func(ptr); */
 #define setptr(ptr, result)\
 	{\
-		gpointer tmp = ptr;\
+		gpointer setptr_tmp = ptr;\
 		ptr = result;\
-		g_free(tmp);\
+		g_free(setptr_tmp);\
 	}