diff --git a/linebuf.c b/linebuf.c index 75bde4c..3711f30 100644 --- a/linebuf.c +++ b/linebuf.c @@ -29,12 +29,17 @@ #include #include #include -#include #include #include #include #include +#ifdef WIN32 +#include +#else +#include +#endif + #include "linebuf.h" /* diff --git a/zero-epwing/main.go b/zero-epwing/main.go index 0101a58..5d29bd3 100644 --- a/zero-epwing/main.go +++ b/zero-epwing/main.go @@ -7,7 +7,6 @@ import ( "io/ioutil" "log" "os" - "path" zig "github.com/FooSoft/zero-epwing-go" ) @@ -66,7 +65,7 @@ func main() { ) flag.Usage = func() { - fmt.Fprintf(os.Stderr, "Usage: %s [options] path\n", path.Base(os.Args[0])) + fmt.Fprintf(os.Stderr, "Usage: zero-epwing [options] path\n") fmt.Fprintf(os.Stderr, "Parameters:\n") flag.PrintDefaults() } diff --git a/zig.go b/zig.go index 57bb37a..3c8905c 100644 --- a/zig.go +++ b/zig.go @@ -10,7 +10,8 @@ import ( ) /* -#cgo LDFLAGS: -lz +#cgo linux LDFLAGS: -lz +#cgo windows LDFLAGS: -lz -lws2_32 #include "zig.h" */ import "C" @@ -74,7 +75,7 @@ func (c *Context) initialize() error { return fmt.Errorf("eb_initialize_library failed with code: %s", formatError(errEb)) } - c.book = (*C.EB_Book)(C.calloc(1, C.size_t(unsafe.Sizeof(C.EB_Book{}))+8)) + c.book = (*C.EB_Book)(C.calloc(1, C.size_t(unsafe.Sizeof(C.EB_Book{})))) C.eb_initialize_book(c.book) c.hookset = (*C.EB_Hookset)(C.calloc(1, C.size_t(unsafe.Sizeof(C.EB_Hookset{}))))