1
0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00

ci: do not use htonll and ntohll on windows, use the portable versions instead.

This commit is contained in:
Delyan Angelov 2021-10-02 18:20:24 +03:00
parent 9a4dbc25ca
commit 0916806350
No known key found for this signature in database
GPG Key ID: 66886C0F12D595ED
5 changed files with 63 additions and 69 deletions

View File

@ -0,0 +1,9 @@
module conv
#include <arpa/inet.h>
fn C.htonl(host u32) u32
fn C.htons(host u16) u16
fn C.ntohl(net u32) u32
fn C.ntohs(net u16) u16

View File

@ -0,0 +1,15 @@
module conv
#include <winsock2.h>
#flag -lws2_32
fn C.htonl(host u32) u32
fn C.htons(host u16) u16
fn C.ntohl(net u32) u32
fn C.ntohs(net u16) u16
//** These are not supplied with mingw/gcc **
// fn C.htonll(host u64) u64
// fn C.ntohll(net u64) u64

View File

@ -19,3 +19,42 @@ pub fn nth32(host u32) u32 {
pub fn nth16(host u16) u16 {
return C.ntohs(host)
}
//******************************
struct Bytes {
mut:
first u32
last u32
}
union LongLong {
Bytes
ll u64
}
// host to net 64 (htonll)
pub fn htn64(host u64) u64 {
mut ll := LongLong{
ll: host
}
unsafe {
ll.first = htn32(ll.first)
ll.last = htn32(ll.last)
}
return unsafe { ll.ll }
}
// net to host 64 (ntohll)
pub fn nth64(net u64) u64 {
mut ll := LongLong{
ll: net
}
unsafe {
ll.first = nth32(ll.first)
ll.last = nth32(ll.last)
}
return unsafe { ll.ll }
}

View File

@ -1,46 +0,0 @@
module conv
#include <arpa/inet.h>
fn C.htonl(host u32) u32
fn C.htons(host u16) u16
fn C.ntohl(net u32) u32
fn C.ntohs(net u16) u16
struct Bytes {
mut:
first u32
last u32
}
union LongLong {
Bytes
ll u64
}
// host to net 64 (htonll)
pub fn htn64(host u64) u64 {
mut ll := LongLong{
ll: host
}
unsafe {
ll.first = htn32(ll.first)
ll.last = htn32(ll.last)
}
return unsafe { ll.ll }
}
// net to host 64 (ntohll)
pub fn nth64(net u64) u64 {
mut ll := LongLong{
ll: net
}
unsafe {
ll.first = nth32(ll.first)
ll.last = nth32(ll.last)
}
return unsafe { ll.ll }
}

View File

@ -1,23 +0,0 @@
module conv
#include <winsock2.h>
#flag -lws2_32
fn C.htonll(host u64) u64
fn C.htonl(host u32) u32
fn C.htons(host u16) u16
fn C.ntohll(net u64) u64
fn C.ntohl(net u32) u32
fn C.ntohs(net u16) u16
// host to net 64 (htonll)
pub fn htn64(host u64) u64 {
return C.htonll(host)
}
// net to host 64 (htonll)
pub fn nth64(host u64) u64 {
return C.ntohll(host)
}