diff options
| author | José Alburquerque <jaalburqu@svn.gnome.org> | 2010-12-20 23:22:11 -0500 |
|---|---|---|
| committer | José Alburquerque <jaalburqu@svn.gnome.org> | 2010-12-20 23:22:11 -0500 |
| commit | 11f1ff17248ea37c5f95969b72672758091f4867 (patch) | |
| tree | 3054a7c16bc65814045d57d1df3cf34067e9f2da | |
| parent | 2eff97b849a744ad07531f23969abf738edfd99a (diff) | |
| download | glibmm-11f1ff17248ea37c5f95969b72672758091f4867.tar.gz | |
Allow giomm to build under mingw32.
* gio/src/unixcredentialsmessage.hg:
* gio/src/unixfdlist.hg:
* gio/src/unixfdmessage.hg:
* gio/src/unixsocketaddress.hg: Add the _GTKMM_WIN_NO_WRAP macro to
newly added giomm classes so that giomm builds under mingw32.
Fixes Bug #636754
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | gio/src/unixcredentialsmessage.hg | 1 | ||||
| -rw-r--r-- | gio/src/unixfdlist.hg | 1 | ||||
| -rw-r--r-- | gio/src/unixfdmessage.hg | 1 | ||||
| -rw-r--r-- | gio/src/unixsocketaddress.hg | 1 |
5 files changed, 16 insertions, 0 deletions
@@ -1,5 +1,17 @@ 2010-12-20 José Alburquerque <jaalburqu@svn.gnome.org> + Allow giomm to build under mingw32. + + * gio/src/unixcredentialsmessage.hg: + * gio/src/unixfdlist.hg: + * gio/src/unixfdmessage.hg: + * gio/src/unixsocketaddress.hg: Add the _GTKMM_WIN_NO_WRAP macro to + newly added giomm classes so that giomm builds under mingw32. + + Fixes Bug #636754 + +2010-12-20 José Alburquerque <jaalburqu@svn.gnome.org> + Variant: Add a VariantStringBase and a VariantContainerBase class. * glib/src/variant.{ccg,hg} (VariantStringBase): Implement a new class diff --git a/gio/src/unixcredentialsmessage.hg b/gio/src/unixcredentialsmessage.hg index ba99cff0..ff13e0d2 100644 --- a/gio/src/unixcredentialsmessage.hg +++ b/gio/src/unixcredentialsmessage.hg @@ -42,6 +42,7 @@ class Credentials; class UnixCredentialsMessage : public SocketControlMessage { _CLASS_GOBJECT(UnixCredentialsMessage, GUnixCredentialsMessage, G_UNIX_CREDENTIALS_MESSAGE, Gio::SocketControlMessage, GSocketControlMessage) + _GTKMMPROC_WIN32_NO_WRAP protected: _CTOR_DEFAULT diff --git a/gio/src/unixfdlist.hg b/gio/src/unixfdlist.hg index b1a38a98..1ee42319 100644 --- a/gio/src/unixfdlist.hg +++ b/gio/src/unixfdlist.hg @@ -39,6 +39,7 @@ namespace Gio class UnixFDList : public Glib::Object { _CLASS_GOBJECT(UnixFDList, GUnixFDList, G_UNIX_FD_LIST, Glib::Object, GObject) + _GTKMMPROC_WIN32_NO_WRAP protected: _CTOR_DEFAULT diff --git a/gio/src/unixfdmessage.hg b/gio/src/unixfdmessage.hg index 728755bf..9f22fb04 100644 --- a/gio/src/unixfdmessage.hg +++ b/gio/src/unixfdmessage.hg @@ -42,6 +42,7 @@ class UnixFDList; class UnixFDMessage : public SocketControlMessage { _CLASS_GOBJECT(UnixFDMessage, GUnixFDMessage, G_UNIX_FD_MESSAGE, Gio::SocketControlMessage, GSocketControlMessage) + _GTKMMPROC_WIN32_NO_WRAP protected: _CTOR_DEFAULT diff --git a/gio/src/unixsocketaddress.hg b/gio/src/unixsocketaddress.hg index 8ff41695..75baa0b9 100644 --- a/gio/src/unixsocketaddress.hg +++ b/gio/src/unixsocketaddress.hg @@ -48,6 +48,7 @@ class UnixSocketAddress : public SocketAddress { _CLASS_GOBJECT(UnixSocketAddress, GUnixSocketAddress, G_UNIX_SOCKET_ADDRESS, SocketAddress, GSocketAddress) + _GTKMMPROC_WIN32_NO_WRAP protected: _WRAP_CTOR(UnixSocketAddress(const std::string& path), g_unix_socket_address_new) |