SF.net SVN: geany: [2147] trunk

[eht16 at users.sourceforge.net]

Revision: 2147
          http://geany.svn.sourceforge.net/geany/?rev=2147&view=rev
Author:   eht16
Date:     2008-01-04 05:57:17 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
Remove filetype macro to avoid naming conflicts.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-01-03 21:08:43 UTC (rev 2146)
+++ trunk/ChangeLog	2008-01-04 13:57:17 UTC (rev 2147)
@@ -1,7 +1,13 @@
+2008-01-04  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * plugins/pluginmacros.h:
+   Remove filetype macro to avoid naming conflicts.
+
+
 2008-01-03  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * THANKS, src/about.c, po/ja.po, po/LINGUAS:
-      Adding of Japanese translation (Thanks to Tarot Osuji).
+   Adding of Japanese translation (Thanks to Tarot Osuji).
 
 
 2008-01-02  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>

Modified: trunk/plugins/pluginmacros.h
===================================================================
--- trunk/plugins/pluginmacros.h	2008-01-03 21:08:43 UTC (rev 2146)
+++ trunk/plugins/pluginmacros.h	2008-01-04 13:57:17 UTC (rev 2147)
@@ -35,8 +35,6 @@
 #define dialogs			geany_data->dialogs
 #define documents		geany_data->documents	// avoids conflict with document typedef
 #define encodings		geany_data->encoding	// avoids conflict with document::encoding
-/// TODO not sure whether "filetype" is good, might conflict with something
-#define filetype		geany_data->filetype
 #define highlighting	geany_data->highlighting
 #define keybindings		geany_data->keybindings
 #define msgwindow		geany_data->msgwindow


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