Migrate the link_darwin_amd64.go and control.go files back; fixed up errors in the C files and util.go.

5 files changed, 4 insertions, 3 deletions

diff --git a/BBB_GOFILES/control.go b/control.go
index 23a8ddf..ab8673c 100644
--- a/BBB_GOFILES/control.go
+++ b/control.go
@@ -6,7 +6,7 @@ import (
 	"unsafe"
 )
 
-// #include "ui.h"
+// #include "pkgui.h"
 import "C"
 
 // no need to lock this; only the GUI thread can access it
diff --git a/BBB_GOFILES/link_darwin_amd64.go b/link_darwin_amd64.go
index ef9c2e5..ef9c2e5 100644
--- a/BBB_GOFILES/link_darwin_amd64.go
+++ b/link_darwin_amd64.go
diff --git a/pkgui.c b/pkgui.c
index 7caab2c..586f5e9 100644
--- a/pkgui.c
+++ b/pkgui.c
@@ -1,6 +1,6 @@
 // 26 august 2018
 #include "pkgui.h"
-#include "xxxxx"
+#include "_cgo_export.h"
 
 uiInitOptions *pkguiAllocInitOptions(void)
 {
diff --git a/pkgui.h b/pkgui.h
index 2af5f2b..9aaa394 100644
--- a/pkgui.h
+++ b/pkgui.h
@@ -1,5 +1,5 @@
 // 12 august 2018
-#include <stdio.h>
+#include <stdlib.h>
 #include "ui.h"
 
 // main.go
diff --git a/util.go b/util.go
index 667f679..e7fb937 100644
--- a/util.go
+++ b/util.go
@@ -12,6 +12,7 @@ import "C"
 //export pkguiAlloc
 func pkguiAlloc(n C.size_t) unsafe.Pointer {
 	// cgo turns C.malloc() into a panic-on-OOM version; use it
+	// TODO make sure it zero-initializes too
 	return C.malloc(n)
 }