diff options
| author | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-11-10 00:05:52 +0100 |
|---|---|---|
| committer | Michael 'Mickey' Lauer <mickey@vanille-media.de> | 2009-11-10 00:05:52 +0100 |
| commit | 671d1676d44aef5470576352dec79df355e497e5 (patch) | |
| tree | ca549eb5ca1a1a8a07f9e7c51d725fdc0c3df591 /libfsotransport | |
| parent | 941d585d7f15aef3d0f553b4bfe42db63038b68c (diff) | |
| download | cornucopia-671d1676d44aef5470576352dec79df355e497e5.tar.gz cornucopia-671d1676d44aef5470576352dec79df355e497e5.tar.bz2 cornucopia-671d1676d44aef5470576352dec79df355e497e5.zip | |
libfsotransport: reduce posixextra.vapi to match upstream additions
We require Vala 0.7.8.1 now
Diffstat (limited to 'libfsotransport')
| -rw-r--r-- | libfsotransport/configure.ac | 2 | ||||
| -rw-r--r-- | libfsotransport/fsotransport/socket.vala | 4 | ||||
| -rw-r--r-- | libfsotransport/vapi/posixextra.vapi | 16 |
3 files changed, 5 insertions, 17 deletions
diff --git a/libfsotransport/configure.ac b/libfsotransport/configure.ac index 93be9874..df9bde5b 100644 --- a/libfsotransport/configure.ac +++ b/libfsotransport/configure.ac @@ -18,7 +18,7 @@ AC_SUBST(LDFLAGS) # PKG_PROG_PKG_CONFIG -VALA_REQUIRED=0.7.8 +VALA_REQUIRED=0.7.8.1 GLIB_REQUIRED=2.22.0 GEE_REQUIRED=0.5.0 FSO_BASICS_REQUIRED=0.8.9.9 diff --git a/libfsotransport/fsotransport/socket.vala b/libfsotransport/fsotransport/socket.vala index 5c372aef..b062259e 100644 --- a/libfsotransport/fsotransport/socket.vala +++ b/libfsotransport/fsotransport/socket.vala @@ -75,8 +75,8 @@ public class FsoFramework.SocketTransport : FsoFramework.BaseTransport var address = addresses.nth_data(0); logger.info( "Resolved $name to $address" ); - PosixExtra.InAddr inaddr = { 0 }; - var res = PosixExtra.inet_aton( address.to_string(), out inaddr ); + Posix.InAddr inaddr = { 0 }; + var res = Linux.inet_aton( address.to_string(), out inaddr ); if ( res == -1 ) { logger.error( "Could not convert address: %s".printf( Posix.strerror( Posix.errno ) ) ); diff --git a/libfsotransport/vapi/posixextra.vapi b/libfsotransport/vapi/posixextra.vapi index 1f249bd8..a347b5d2 100644 --- a/libfsotransport/vapi/posixextra.vapi +++ b/libfsotransport/vapi/posixextra.vapi @@ -3,24 +3,12 @@ [CCode (lower_case_cprefix = "")] namespace PosixExtra { - [CCode (cheader_filename = "arpa/inet.h")] - public weak string inet_ntoa (PosixExtra.InAddr addr); - - [CCode (cheader_filename = "arpa/inet.h")] - public int inet_aton(string cp, out PosixExtra.InAddr addr); - - [SimpleType] - [CCode (cname = "struct in_addr", cheader_filename = "sys/socket.h", destroy_function = "")] - public struct InAddr { - public uint32 s_addr; - } - [CCode (cname = "struct sockaddr_in", cheader_filename = "netinet/in.h", destroy_function = "")] public struct SockAddrIn { public int sin_family; public uint16 sin_port; - public PosixExtra.InAddr sin_addr; - } + public Posix.InAddr sin_addr; + } } |