diff options
| author | Paul Buetow <35781042+pbuetow@users.noreply.github.com> | 2020-12-29 09:48:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-29 09:48:56 +0000 |
| commit | 0fe3c8708634cc59d61bf47bd909ef0111f0d56a (patch) | |
| tree | c9f0dfa884927079de309b68c48224f4b0f00d0d /internal/io | |
| parent | 495e9f38220a6d448b15882a235e7a9c21f21d18 (diff) | |
| parent | 0099a7ab9e1d28300c69c3b50b4ebe1cde9a8cbc (diff) | |
Merge pull request #20 from snonux/develop
Make CGo dependencies optional (e.g. Linux ACL support)
Diffstat (limited to 'internal/io')
| -rw-r--r-- | internal/io/fs/permissions/permission.go | 2 | ||||
| -rw-r--r-- | internal/io/fs/permissions/permission_linuxacl.c (renamed from internal/io/fs/permissions/permission_linux.c) | 4 | ||||
| -rw-r--r-- | internal/io/fs/permissions/permission_linuxacl.go (renamed from internal/io/fs/permissions/permission_linux.go) | 4 | ||||
| -rw-r--r-- | internal/io/fs/permissions/permission_linuxacl.h (renamed from internal/io/fs/permissions/permission_linux.h) | 2 | ||||
| -rw-r--r-- | internal/io/fs/permissions/permission_test.go | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/internal/io/fs/permissions/permission.go b/internal/io/fs/permissions/permission.go index 0ed4f17..cc5dd9b 100644 --- a/internal/io/fs/permissions/permission.go +++ b/internal/io/fs/permissions/permission.go @@ -1,4 +1,4 @@ -// +build !linux +// +build !linuxacl package permissions diff --git a/internal/io/fs/permissions/permission_linux.c b/internal/io/fs/permissions/permission_linuxacl.c index cd10525..86b1185 100644 --- a/internal/io/fs/permissions/permission_linux.c +++ b/internal/io/fs/permissions/permission_linuxacl.c @@ -1,4 +1,6 @@ -#include "permission_linux.h" +// +build linuxacl + +#include "permission_linuxacl.h" #ifdef DEBUG void debug_print_checker(struct permission_checker *pc) { diff --git a/internal/io/fs/permissions/permission_linux.go b/internal/io/fs/permissions/permission_linuxacl.go index bbc039b..7d2d7ca 100644 --- a/internal/io/fs/permissions/permission_linux.go +++ b/internal/io/fs/permissions/permission_linuxacl.go @@ -1,7 +1,9 @@ +// +build linuxacl + package permissions /* -#include "permission_linux.h" +#include "permission_linuxacl.h" #cgo LDFLAGS: -L. -lacl */ import "C" diff --git a/internal/io/fs/permissions/permission_linux.h b/internal/io/fs/permissions/permission_linuxacl.h index a2c266e..52dadcf 100644 --- a/internal/io/fs/permissions/permission_linux.h +++ b/internal/io/fs/permissions/permission_linuxacl.h @@ -1,3 +1,5 @@ +// +build linuxacl + #ifndef PERMISSION_LINUX_H #define PERMISSION_LINUX_H diff --git a/internal/io/fs/permissions/permission_test.go b/internal/io/fs/permissions/permission_test.go index d415ac2..c0ef038 100644 --- a/internal/io/fs/permissions/permission_test.go +++ b/internal/io/fs/permissions/permission_test.go @@ -1,4 +1,4 @@ -// +build linux +// +build linuxacl package permissions |