diff options
| author | Armin Burgmeier <armin@openismus.com> | 2008-10-10 22:05:50 +0000 |
|---|---|---|
| committer | Armin Burgmeier <arminb@src.gnome.org> | 2008-10-10 22:05:50 +0000 |
| commit | d55de9118b09450083ecc47c0c983263f3fd7a77 (patch) | |
| tree | 15728c10f2f6e01d8bf909f6e0089fb15ac58451 | |
| parent | 688a39a00e243ff0da01ac6fb2af14a6732ba233 (diff) | |
| download | glibmm-d55de9118b09450083ecc47c0c983263f3fd7a77.tar.gz | |
Rename FILE_TYPE_UNKNOWN to FILE_TYPE_NOT_KNOWN because the former is a
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.
svn path=/trunk/; revision=738
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | gio/src/fileinfo.hg | 11 |
2 files changed, 17 insertions, 1 deletions
@@ -1,5 +1,12 @@ 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. + +2008-10-09 Armin Burgmeier <armin@openismus.com> + * MSVC_Net2008/Makefile.am: Removed README from EXTRA_DIST to fix `make dist'. diff --git a/gio/src/fileinfo.hg b/gio/src/fileinfo.hg index 9540673a..f77b4a3a 100644 --- a/gio/src/fileinfo.hg +++ b/gio/src/fileinfo.hg @@ -29,7 +29,16 @@ _PINCLUDE(glibmm/private/object_p.h) 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 |