Revision: 1914 http://geany.svn.sourceforge.net/geany/?rev=1914&view=rev Author: ntrel Date: 2007-09-27 08:09:54 -0700 (Thu, 27 Sep 2007)
Log Message: ----------- Fix possible conflict of 'tmp' variable name in setptr macro.
Modified Paths: -------------- trunk/src/keyfile.c trunk/src/utils.h
Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2007-09-27 11:39:21 UTC (rev 1913) +++ trunk/src/keyfile.c 2007-09-27 15:09:54 UTC (rev 1914) @@ -624,7 +624,7 @@ { 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) ?
Modified: trunk/src/utils.h =================================================================== --- trunk/src/utils.h 2007-09-27 11:39:21 UTC (rev 1913) +++ trunk/src/utils.h 2007-09-27 15:09:54 UTC (rev 1914) @@ -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);\ }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.