From 925adc0782c4dd9b978a712b1b5645b5f31bf802 Mon Sep 17 00:00:00 2001 From: Pietro Gagliardi Date: Sun, 12 Aug 2018 11:07:33 -0400 Subject: Fixed build errors. --- main.go | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'main.go') diff --git a/main.go b/main.go index 1ba6d05..6500345 100644 --- a/main.go +++ b/main.go @@ -12,7 +12,9 @@ import ( // #include "ui.h" // extern void doQueueMain(void *); // extern int doOnShouldQuit(void *); -// extern int doOnTimer(void *); +// // see golang/go#19835 +// typedef void (*queueMainCallback)(void *); +// typedef int (*onShouldQuitCallback)(void *); import "C" // make sure main() runs on the first thread created by the OS @@ -39,7 +41,7 @@ func Main(f func()) error { C.uiFreeInitError(estr) return err } - C.uiOnShouldQuit(C.doOnShouldQuit, nil) + C.uiOnShouldQuit(C.onShouldQuitCallback(C.doOnShouldQuit), nil) QueueMain(f) C.uiMain() return nil @@ -88,7 +90,7 @@ func QueueMain(f func()) { } } qmmap[n] = f - C.uiQueueMain(C.doQueueMain, unsafe.Pointer(n)) + C.uiQueueMain(C.queueMainCallback(C.doQueueMain), unsafe.Pointer(n)) } //export doQueueMain -- cgit v1.2.3