Merge pull request #106 from gucio321/fix-longlong

extra types: fix C type in plot time

Author: AllenDang

cimgui_funcs.go

@@ -30,7 +30,7 @@ func argWrapper(argType string) (wrapper argumentWrapper, err error) {
 		"const char* const[]":      charPtrPtrW,
 		"unsigned char":            simpleW("uint", "C.uchar"),
 		"unsigned char**":          uCharPtrW,
-		"size_t":                   simpleW("uint64", "C.xlong"),
+		"size_t":                   simpleW("uint64", "C.xulong"),
 		"size_t*":                  sizeTPtrW,
 		"float":                    floatW,
 		"float*":                   floatPtrW,
@@ -130,7 +130,7 @@ func uCharPtrW(arg ArgDef) ArgumentWrapperData {
 func sizeTPtrW(arg ArgDef) ArgumentWrapperData {
 	return ArgumentWrapperData{
 		ArgType: "*uint64",
-		VarName: fmt.Sprintf("(*C.xlong)(%s)", arg.Name),
+		VarName: fmt.Sprintf("(*C.xulong)(%s)", arg.Name),
 	}
 }
 

cmd/codegen/arguments_wrapper.go

@@ -2,7 +2,9 @@ package imgui
 
 // #include "cimgui_wrapper.h"
 // #include "cimplot_wrapper.h"
+// #include "extra_types.h"
 import "C"
+
 import (
 	"image/color"
 	"time"
@@ -202,7 +204,7 @@ func (i *PlotTime) fromC(p C.ImPlotTime) *PlotTime {
 }
 
 func (p PlotTime) toC() C.ImPlotTime {
-	return C.ImPlotTime{S: C.long(p.S), Us: C.int(p.Us)}
+	return C.ImPlotTime{S: C.xlong(p.S), Us: C.int(p.Us)}
 }
 
 // wrappableType represents a GO type that can be converted into a C value

extra_types.go

@@ -1,7 +1,9 @@
 #pragma once
 
 #ifdef __WIN32
-typedef unsigned long long xlong;
+typedef unsigned long long xulong;
+typedef long long xlong;
 #else
-typedef unsigned long xlong;
+typedef unsigned long xulong;
+typedef long xlong;
 #endif

extra_types.h

@@ -72,7 +72,7 @@ func InputTextWithHint(label, hint string, buf *string, flags InputTextFlags, ca
 		labelArg,
 		hintArg,
 		(*C.char)(state.buf.ptr),
-		C.xlong(len(*buf)+1),
+		C.xulong(len(*buf)+1),
 		C.ImGuiInputTextFlags(flags),
 		C.ImGuiInputTextCallback(C.generalInputTextCallback),
 		unsafe.Pointer(&stateHandle),
@@ -101,7 +101,7 @@ func InputTextMultiline(label string, buf *string, size Vec2, flags InputTextFla
 	return C.igInputTextMultiline(
 		labelArg,
 		(*C.char)(state.buf.ptr),
-		C.xlong(len(*buf)+1),
+		C.xulong(len(*buf)+1),
 		size.toC(),
 		C.ImGuiInputTextFlags(flags),
 		C.ImGuiInputTextCallback(C.generalInputTextCallback),