Skip to content
This repository has been archived by the owner on Oct 12, 2022. It is now read-only.

Commit

Permalink
freebsd: Update pragma(mangle) versions for FreeBSD 12
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibuclaw
ibuclaw committed Nov 21, 2020
1 parent 90b7dfd commit ff795e4
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 22 deletions.
14 changes: 10 additions & 4 deletions src/core/sys/freebsd/sys/event.d
View file
Expand Up @@ -161,7 +161,13 @@ enum
}

int kqueue();
pragma(mangle, "kevent@FBSD_1.0")
int kevent(int kq, const kevent_t *changelist, int nchanges,
kevent_t *eventlist, int nevents,
const timespec *timeout);
static if (__FreeBSD_version >= 1200000)
pragma(mangle, "kevent@@FBSD_1.5")
int kevent(int kq, const kevent_t *changelist, int nchanges,
kevent_t *eventlist, int nevents,
const timespec *timeout);
else
pragma(mangle, "kevent@FBSD_1.0")
int kevent(int kq, const kevent_t *changelist, int nchanges,
kevent_t *eventlist, int nevents,
const timespec *timeout);
35 changes: 23 additions & 12 deletions src/core/sys/freebsd/sys/mount.d
View file
Expand Up @@ -298,17 +298,28 @@ enum uint VQ_FLAG2000 = 0x2000;
enum uint VQ_FLAG4000 = 0x4000;
enum uint VQ_FLAG8000 = 0x8000;

pragma(mangle, "fhopen@@FBSD_1.0") int fhopen(const fhandle_t*, int);
pragma(mangle, "fhstat@FBSD_1.0") int fhstat(const fhandle_t*, stat_t*);
pragma(mangle, "fhstatfs@FBSD_1.0") int fhstatfs(const fhandle_t*, statfs_t*);
pragma(mangle, "fstatfs@FBSD_1.0") int fstatfs(int, statfs_t*);
pragma(mangle, "getfh@@FBSD_1.0") int getfh(const char*, fhandle_t*);
pragma(mangle, "getfsstat@FBSD_1.0") int getfsstat(statfs_t*, c_long, int);
pragma(mangle, "getmntinfo@FBSD_1.0") int getmntinfo(statfs_t**, int);
pragma(mangle, "lgetfh@@FBSD_1.0") int lgetfh(const char*, fhandle_t*);
pragma(mangle, "mount@@FBSD_1.0") int mount(const char*, const char*, int, void*);
static if (__FreeBSD_version >= 1200000)
{
pragma(mangle, "fhstat@FBSD_1.5") int fhstat(const fhandle_t*, stat_t*);
pragma(mangle, "fhstatfs@FBSD_1.5") int fhstatfs(const fhandle_t*, statfs_t*);
pragma(mangle, "fstatfs@FBSD_1.5") int fstatfs(int, statfs_t*);
pragma(mangle, "getfsstat@FBSD_1.5") int getfsstat(statfs_t*, c_long, int);
pragma(mangle, "getmntinfo@FBSD_1.5") int getmntinfo(statfs_t**, int);
pragma(mangle, "statfs@FBSD_1.5") int statfs(const char*, statfs_t*);
}
else
{
pragma(mangle, "fhstat@FBSD_1.0") int fhstat(const fhandle_t*, stat_t*);
pragma(mangle, "fhstatfs@FBSD_1.0") int fhstatfs(const fhandle_t*, statfs_t*);
pragma(mangle, "fstatfs@FBSD_1.0") int fstatfs(int, statfs_t*);
pragma(mangle, "getfsstat@FBSD_1.0") int getfsstat(statfs_t*, c_long, int);
pragma(mangle, "getmntinfo@FBSD_1.0") int getmntinfo(statfs_t**, int);
pragma(mangle, "statfs@FBSD_1.0") int statfs(const char*, statfs_t*);
}
pragma(mangle, "fhopen@@FBSD_1.0") int fhopen(const fhandle_t*, int);
pragma(mangle, "getfh@@FBSD_1.0") int getfh(const char*, fhandle_t*);
pragma(mangle, "lgetfh@@FBSD_1.0") int lgetfh(const char*, fhandle_t*);
pragma(mangle, "mount@@FBSD_1.0") int mount(const char*, const char*, int, void*);
//int nmount(iovec*, uint, int);
pragma(mangle, "statfs@FBSD_1.0") int statfs(const char*, statfs_t*);
pragma(mangle, "unmount@@FBSD_1.0") int unmount(const char*, int);

pragma(mangle, "unmount@@FBSD_1.0") int unmount(const char*, int);
//int getvfsbyname(const char*, xvfsconf*);
10 changes: 8 additions & 2 deletions src/core/sys/posix/dirent.d
View file
Expand Up @@ -186,7 +186,10 @@ else version (FreeBSD)

alias void* DIR;

pragma(mangle, "readdir@FBSD_1.0") dirent* readdir(DIR*);
static if (__FreeBSD_version >= 1200000)
pragma(mangle, "readdir@FBSD_1.5") dirent* readdir(DIR*);
else
pragma(mangle, "readdir@FBSD_1.0") dirent* readdir(DIR*);
}
else version (NetBSD)
{
Expand Down Expand Up @@ -504,7 +507,10 @@ else version (Darwin)
}
else version (FreeBSD)
{
pragma(mangle, "readdir_r@FBSD_1.0") int readdir_r(DIR*, dirent*, dirent**);
static if (__FreeBSD_version >= 1200000)
pragma(mangle, "readdir_r@FBSD_1.5") int readdir_r(DIR*, dirent*, dirent**);
else
pragma(mangle, "readdir_r@FBSD_1.0") int readdir_r(DIR*, dirent*, dirent**);
}
else version (DragonFlyBSD)
{
Expand Down
20 changes: 16 additions & 4 deletions src/core/sys/posix/sys/stat.d
View file
Expand Up @@ -2278,9 +2278,18 @@ else version (Darwin)
}
else version (FreeBSD)
{
pragma(mangle, "fstat@FBSD_1.0") int fstat(int, stat_t*);
pragma(mangle, "lstat@FBSD_1.0") int lstat(const scope char*, stat_t*);
pragma(mangle, "stat@FBSD_1.0") int stat(const scope char*, stat_t*);
static if (__FreeBSD_version >= INO64_FIRST)
{
pragma(mangle, "fstat@FBSD_1.5") int fstat(int, stat_t*);
pragma(mangle, "lstat@FBSD_1.5") int lstat(const scope char*, stat_t*);
pragma(mangle, "stat@FBSD_1.5") int stat(const scope char*, stat_t*);
}
else
{
pragma(mangle, "fstat@FBSD_1.0") int fstat(int, stat_t*);
pragma(mangle, "lstat@FBSD_1.0") int lstat(const scope char*, stat_t*);
pragma(mangle, "stat@FBSD_1.0") int stat(const scope char*, stat_t*);
}
}
else version (NetBSD)
{
Expand Down Expand Up @@ -2400,7 +2409,10 @@ else version (FreeBSD)
enum S_IFLNK = 0xA000; // octal 0120000
enum S_IFSOCK = 0xC000; // octal 0140000

pragma(mangle, "mknod@FBSD_1.0") int mknod(const scope char*, mode_t, dev_t);
static if (__FreeBSD_version >= INO64_FIRST)
pragma(mangle, "mknod@FBSD_1.5") int mknod(const scope char*, mode_t, dev_t);
else
pragma(mangle, "mknod@FBSD_1.0") int mknod(const scope char*, mode_t, dev_t);
}
else version (NetBSD)
{
Expand Down

0 comments on commit ff795e4

Please sign in to comment.