glibmm r738 - in trunk: . gio/src

[arminb svn gnome org]

Author: arminb
Date: Fri Oct 10 22:05:50 2008
New Revision: 738
URL: http://svn.gnome.org/viewvc/glibmm?rev=738&view=rev

Log:
2008-10-09  Armin Burgmeier  <armin openismus com>

	* gio/src/fileinfo.hg: Rename FILE_TYPE_UNKNOWN to FILE_TYPE_NOT_KNOWN
	because the former is a #define on Windows in winbase.h, included from
	windows.h. Keep FILE_TYPE_UNKNOWN for compatibility if it is not
	already defined.


Modified:
   trunk/ChangeLog
   trunk/gio/src/fileinfo.hg

Modified: trunk/gio/src/fileinfo.hg
==============================================================================
--- trunk/gio/src/fileinfo.hg	(original)
+++ trunk/gio/src/fileinfo.hg	Fri Oct 10 22:05:50 2008
@@ -29,7 +29,16 @@
 namespace Gio
 {
 
-_WRAP_ENUM(FileType, GFileType, NO_GTYPE)
+// Rename FILE_TYPE_UNKNOWN to FILE_TYPE_NOT_KNOWN because the former is a
+// define in a Windows header (winbase.h, included from windows.h).
+_WRAP_ENUM(FileType, GFileType, NO_GTYPE, s#FILE_TYPE_UNKNOWN#FILE_TYPE_NOT_KNOWN#)
+
+// Provide FILE_TYPE_UNKNOWN for backwards compatibility.
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
+#ifndef FILE_TYPE_UNKNOWN
+const FileType FILE_TYPE_UNKNOWN = FILE_TYPE_NOT_KNOWN;
+#endif
+#endif
 
 //TODO: attribute strings