diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-04-14 14:54:39 +0200 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2017-04-14 14:54:39 +0200 |
| commit | 1e6bca5a6b31afe8e40e3a417a8a3143d9e32415 (patch) | |
| tree | 63f3f080d00e4625ad53971325ca8b025a36b02e | |
| parent | c65601e351af5f5d4d8f741b2118913a727951ff (diff) | |
| download | glibmm-1e6bca5a6b31afe8e40e3a417a8a3143d9e32415.tar.gz | |
Gio: Remove enum ErrorEnum
* gio/src/enums.hg: GIOErrorEnum was wrapped twice, with _WRAP_ENUM in
gio/src/enums.hg, and with _WRAP_GERROR in gio/src/error.hg. Remove the
wrapping with _WRAP_ENUM. Uses of Gio::ErrorEnum, if any, can be replaced
by Gio::Error::Code.
| -rw-r--r-- | gio/src/enums.hg | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/gio/src/enums.hg b/gio/src/enums.hg index 3698a770..7cbe7f53 100644 --- a/gio/src/enums.hg +++ b/gio/src/enums.hg @@ -18,16 +18,6 @@ #include <gio/gio.h> #include <glibmm/value.h> -// There have been issues with other libraries defining HOST_NOT_FOUND (e.g. -// netdb.h). As a workaround, we added the alternate name HOST_WAS_NOT_FOUND. -// Portable code should not use HOST_NOT_FOUND. Undefining it here (and -// restoring it below) will allow programs to compile even if they include -// netdb.h. See Bug #529496 -#ifdef HOST_NOT_FOUND -#define GIOMM_SAVED_HOST_NOT_FOUND HOST_NOT_FOUND -#undef HOST_NOT_FOUND -#endif // HOST_NOT_FOUND - _DEFS(giomm,gio) namespace Gio @@ -36,15 +26,8 @@ namespace Gio // BIG_ENDIAN and LITTLE_ENDIAN are defined as preprocessor macros somewhere. _WRAP_ENUM(DataStreamByteOrder, GDataStreamByteOrder, NO_GTYPE, s#ENDIAN$#ENDIAN_ORDER#) _WRAP_ENUM(DataStreamNewlineType, GDataStreamNewlineType, NO_GTYPE) -_WRAP_ENUM(ErrorEnum, GIOErrorEnum, NO_GTYPE) _WRAP_ENUM(SocketFamily, GSocketFamily) _WRAP_ENUM(TlsAuthenticationMode, GTlsAuthenticationMode) _WRAP_ENUM(TlsCertificateFlags, GTlsCertificateFlags) } // namespace Gio - -#ifdef GIOMM_SAVED_HOST_NOT_FOUND -// restore the previously-defined HOST_NOT_FOUND macro -#define HOST_NOT_FOUND GIOMM_SAVED_HOST_NOT_FOUND -#undef GIOMM_SAVED_HOST_NOT_FOUND -#endif // GIOMM_SAVED_HOST_NOT_FOUND |