Revision: 1980 http://geany.svn.sourceforge.net/geany/?rev=1980&view=rev Author: ntrel Date: 2007-10-26 08:54:28 -0700 (Fri, 26 Oct 2007)

Log Message: ----------- Prevent conflict with document::encoding (oops).

Modified Paths: -------------- trunk/ChangeLog trunk/plugins/pluginmacros.h

Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-10-26 15:53:19 UTC (rev 1979) +++ trunk/ChangeLog 2007-10-26 15:54:28 UTC (rev 1980) @@ -4,6 +4,8 @@ plugins/filebrowser.c, plugins/htmlchars.c, plugins/classbuilder.c: Make all plugins distributed with Geany have the same version number as Geany. + * plugins/pluginmacros.h: + Prevent conflict with document::encoding.

2007-10-25 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>

Modified: trunk/plugins/pluginmacros.h =================================================================== --- trunk/plugins/pluginmacros.h 2007-10-26 15:53:19 UTC (rev 1979) +++ trunk/plugins/pluginmacros.h 2007-10-26 15:54:28 UTC (rev 1980) @@ -33,7 +33,7 @@

#define dialogs geany_data->dialogs #define documents geany_data->document // avoids conflict with document typedef -#define encodings geany_data->encodings // avoids conflict with document::encoding +#define encodings geany_data->encoding // avoids conflict with document::encoding #define keybindings geany_data->keybindings #define msgwindow geany_data->msgwindow #define scintilla geany_data->sci

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.