RepoMirrors
/
go-ceph
mirror of https://github.com/ceph/go-ceph
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #46 from tchaikov/wip-osx 

ioctx: compiles on osx
This commit is contained in:
Kefu Chai 2018-01-01 17:03:11 +08:00 committed by GitHub
parent 81e4191e13 9db9a99b59
commit 2d7cf82ea7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
rados/ioctx.go
View File

@ -11,6 +11,17 @@ package rados
// *idx += strlen(*idx) + 1; // *idx += strlen(*idx) + 1;
// return copy; // return copy;
// } // }
//
// #if __APPLE__
// #define ceph_time_t __darwin_time_t
// #define ceph_suseconds_t __darwin_suseconds_t
// #elif __GLIBC__
// #define ceph_time_t __time_t
// #define ceph_suseconds_t __suseconds_t
// #else
// #define ceph_time_t time_t
// #define ceph_suseconds_t suseconds_t
// #endif
import "C" import "C"
import ( import (
@ -650,7 +661,7 @@ func (ioctx *IOContext) LockExclusive(oid, name, cookie, desc string, duration t
var c_duration C.struct_timeval var c_duration C.struct_timeval
if duration != 0 { if duration != 0 {
tv := syscall.NsecToTimeval(duration.Nanoseconds()) tv := syscall.NsecToTimeval(duration.Nanoseconds())
c_duration = C.struct_timeval{tv_sec: C.__time_t(tv.Sec), tv_usec: C.__suseconds_t(tv.Usec)} c_duration = C.struct_timeval{tv_sec: C.ceph_time_t(tv.Sec), tv_usec: C.ceph_suseconds_t(tv.Usec)}
} }
var c_flags C.uint8_t var c_flags C.uint8_t
@ -699,7 +710,7 @@ func (ioctx *IOContext) LockShared(oid, name, cookie, tag, desc string, duration
var c_duration C.struct_timeval var c_duration C.struct_timeval
if duration != 0 { if duration != 0 {
tv := syscall.NsecToTimeval(duration.Nanoseconds()) tv := syscall.NsecToTimeval(duration.Nanoseconds())
c_duration = C.struct_timeval{tv_sec: C.__time_t(tv.Sec), tv_usec: C.__suseconds_t(tv.Usec)} c_duration = C.struct_timeval{tv_sec: C.ceph_time_t(tv.Sec), tv_usec: C.ceph_suseconds_t(tv.Usec)}
} }
var c_flags C.uint8_t var c_flags C.uint8_t