SF.net SVN: geany: [1979] trunk/plugins/pluginmacros.h

[ntrel at users.sourceforge.net]

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

Log Message:
-----------
Prevent conflict with document::encoding.

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

Modified: trunk/plugins/pluginmacros.h
===================================================================
--- trunk/plugins/pluginmacros.h	2007-10-26 12:32:23 UTC (rev 1978)
+++ trunk/plugins/pluginmacros.h	2007-10-26 15:53:19 UTC (rev 1979)
@@ -32,8 +32,8 @@
 #define prefs		geany_data->prefs
 
 #define dialogs		geany_data->dialogs
-#define documents	geany_data->document
-#define encoding	geany_data->encoding
+#define documents	geany_data->document	// avoids conflict with document typedef
+#define encodings	geany_data->encodings	// 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.