diff --git a/vendor/github.com/syncthing/notify/watcher_fsevents_cgo.go b/vendor/github.com/syncthing/notify/watcher_fsevents_cgo.go index 95ee70444..cf0416c37 100644 --- a/vendor/github.com/syncthing/notify/watcher_fsevents_cgo.go +++ b/vendor/github.com/syncthing/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/syncthing/notify/watcher_fsevents_go1.10.go b/vendor/github.com/syncthing/notify/watcher_fsevents_go1.10.go deleted file mode 100644 index dd2433d20..000000000 --- a/vendor/github.com/syncthing/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 -*/ -import "C" - -var refZero = (*C.struct___CFAllocator)(nil) diff --git a/vendor/github.com/syncthing/notify/watcher_fsevents_go1.11.go b/vendor/github.com/syncthing/notify/watcher_fsevents_go1.11.go deleted file mode 100644 index 92b406ce7..000000000 --- a/vendor/github.com/syncthing/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/manifest b/vendor/manifest index a13261c4e..3a6a9b28f 100644 --- a/vendor/manifest +++ b/vendor/manifest @@ -419,7 +419,7 @@ "importpath": "github.com/syncthing/notify", "repository": "https://github.com/syncthing/notify", "vcs": "git", - "revision": "b76b45868a77e7800dd06cce61101af9c4274bcc", + "revision": "116c45bb5ad48777321e4984d1320d56889b6097", "branch": "master", "notests": true },