aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go6
-rw-r--r--vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.10.go14
-rw-r--r--vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.11.go9
-rw-r--r--vendor/vendor.json6
4 files changed, 6 insertions, 29 deletions
diff --git a/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go b/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go
index 95ee70444..cf0416c37 100644
--- a/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go
+++ b/vendor/github.com/rjeczalik/notify/watcher_fsevents_cgo.go
@@ -48,7 +48,7 @@ var wg sync.WaitGroup // used to wait until the runloop starts
// started and is ready via the wg. It also serves purpose of a dummy source,
// thanks to it the runloop does not return as it also has at least one source
// registered.
-var source = C.CFRunLoopSourceCreate(refZero, 0, &C.CFRunLoopSourceContext{
+var source = C.CFRunLoopSourceCreate(C.kCFAllocatorDefault, 0, &C.CFRunLoopSourceContext{
perform: (C.CFRunLoopPerformCallBack)(C.gosource),
})
@@ -166,8 +166,8 @@ func (s *stream) Start() error {
return nil
}
wg.Wait()
- p := C.CFStringCreateWithCStringNoCopy(refZero, C.CString(s.path), C.kCFStringEncodingUTF8, refZero)
- path := C.CFArrayCreate(refZero, (*unsafe.Pointer)(unsafe.Pointer(&p)), 1, nil)
+ p := C.CFStringCreateWithCStringNoCopy(C.kCFAllocatorDefault, C.CString(s.path), C.kCFStringEncodingUTF8, C.kCFAllocatorDefault)
+ path := C.CFArrayCreate(C.kCFAllocatorDefault, (*unsafe.Pointer)(unsafe.Pointer(&p)), 1, nil)
ctx := C.FSEventStreamContext{}
ref := C.EventStreamCreate(&ctx, C.uintptr_t(s.info), path, C.FSEventStreamEventId(atomic.LoadUint64(&since)), latency, flags)
if ref == nilstream {
diff --git a/vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.10.go b/vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.10.go
deleted file mode 100644
index dd2433d20..000000000
--- a/vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.10.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright (c) 2018 The Notify Authors. All rights reserved.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-// +build darwin,!kqueue,cgo,!go1.11
-
-package notify
-
-/*
- #include <CoreServices/CoreServices.h>
-*/
-import "C"
-
-var refZero = (*C.struct___CFAllocator)(nil)
diff --git a/vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.11.go b/vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.11.go
deleted file mode 100644
index 92b406ce7..000000000
--- a/vendor/github.com/rjeczalik/notify/watcher_fsevents_go1.11.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright (c) 2018 The Notify Authors. All rights reserved.
-// Use of this source code is governed by the MIT license that can be
-// found in the LICENSE file.
-
-// +build darwin,!kqueue,go1.11
-
-package notify
-
-const refZero = 0
diff --git a/vendor/vendor.json b/vendor/vendor.json
index 0bfc1ca0c..fea2c804e 100644
--- a/vendor/vendor.json
+++ b/vendor/vendor.json
@@ -370,10 +370,10 @@
"revisionTime": "2017-08-14T17:01:13Z"
},
{
- "checksumSHA1": "D8AVDI39CJ+jvw0HOotYU2gz54c=",
+ "checksumSHA1": "lU41NL1TEDtsrr0yUdp3SMB4Y9o=",
"path": "github.com/rjeczalik/notify",
- "revision": "4e54e7fd043e865c50bda93359fb78813a8d165b",
- "revisionTime": "2018-08-08T20:39:25Z"
+ "revision": "0f065fa99b48b842c3fd3e2c8b194c6f2b69f6b8",
+ "revisionTime": "2018-08-27T19:31:19Z"
},
{
"checksumSHA1": "5uqO4ITTDMklKi3uNaE/D9LQ5nM=",