diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | gio/src/error.hg | 2 |
2 files changed, 9 insertions, 1 deletions
@@ -1,3 +1,11 @@ +2013-03-26 José Alburquerque <jaalburquerque@gmail.com> + + TlsError: Rename the EOF enum value. + + * gio/src/error.hg (EOF): Rename it to ENDOFFILE to avoid a clash with + another definition of the identifier somewhere else which breaks the + gtkmm build. + 2013-03-26 Murray Cumming <murrayc@murrayc.com> GTlsFileDatabase: Use std::string for filenames. diff --git a/gio/src/error.hg b/gio/src/error.hg index 388b4935..b147a7df 100644 --- a/gio/src/error.hg +++ b/gio/src/error.hg @@ -43,7 +43,7 @@ namespace Gio */ _WRAP_GERROR(Error, GIOErrorEnum, G_IO_ERROR, NO_GTYPE) _WRAP_GERROR(ResolverError, GResolverError, G_RESOLVER_ERROR, NO_GTYPE) -_WRAP_GERROR(TlsError, GTlsError, G_TLS_ERROR, NO_GTYPE) +_WRAP_GERROR(TlsError, GTlsError, G_TLS_ERROR, NO_GTYPE, s#^EOF#ENDOFFILE#) } // namespace Gio |