Merge branch 'master' into fix

Author: bsrdjan

README.md

@@ -6,7 +6,7 @@
 
 The *gorfc* package provides bindings for *SAP NW RFC Library*, for a comfortable way of calling remote enabled ABAP function modules (RFMs) from [Go](https://golang.org).
 
-The current release is fully functional on Linux and experimental on Windows, see the [Issue #1](https://github.com/SAP/gorfc/issues/1).
+The current release is fully functional on Linux and experimental on Windows and macOS see the [Issue #1](https://github.com/SAP/gorfc/issues/1).
 
 ## Table of contents
 
@@ -21,7 +21,7 @@ The current release is fully functional on Linux and experimental on Windows, se
 
 ## Platforms and Prerequisites
 
-The SAP NW RFC Library is a prerequisite for using the Go RFC connector and must be installed on the same system. It is available on many platforms supported by Go, except macOS, Plan 9 and BSD.
+The SAP NW RFC Library is a prerequisite for using the Go RFC connector and must be installed on the same system. It is available on many platforms supported by Go, except Plan 9 and BSD.
 
 A prerequisite to download *SAP NW RFC Library* is having a **customer or partner account** on *SAP Service Marketplace* . If you are SAP employee please check SAP OSS note [1037575 - Software download authorizations for SAP employees](http://service.sap.com/sap/support/notes/1037575).
 
@@ -75,6 +75,8 @@ To install _gorfc_ and dependencies, run following commands:
 ```bash
 export CGO_CFLAGS="-I $SAPNWRFC_HOME/include"
 export CGO_LDFLAGS="-L $SAPNWRFC_HOME/lib"
+export CGO_CFLAGS_ALLOW=.*
+export CGO_LDFLAGS_ALLOW=.*
 go get github.com/stretchr/testify
 go get github.com/sap/gorfc
 cd $GOPATH/src/github.com/sap/gorfc/gorfc

gorfc/gorfc.go

@@ -27,6 +27,17 @@ package gorfc
 #cgo windows LDFLAGS: -L/usr/local/sap/nwrfcsdk/libwin -lsapnwrfc -llibsapucum
 #cgo windows LDFLAGS: -O2 -g
 
+#cgo darwin LDFLAGS: -lsapnwrfc -lsapucum
+#cgo darwin LDFLAGS: -O2 -minline-all-stringops -g -fno-strict-aliasing -fno-omit-frame-pointer
+#cgo darwin LDFLAGS: -m64 -fexceptions -funsigned-char -Wall -Wno-uninitialized -Wno-long-long
+#cgo darwin LDFLAGS: -Wcast-align -pthread
+
+#cgo darwin CFLAGS: -DNDEBUG -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -DSAPonUNIX
+#cgo darwin CFLAGS: -DSAPwithUNICODE -D__NO_MATH_INLINES -DSAPwithTHREADS -DSAPonDARW
+#cgo darwin CFLAGS: -O2 -minline-all-stringops -g -fno-strict-aliasing -fno-omit-frame-pointer
+#cgo darwin CFLAGS: -m64 -fexceptions  -Wall -Wno-uninitialized -Wno-long-long
+#cgo darwin CFLAGS: -Wcast-align -pthread -pipe -Wno-unused-variable
+
 #include <sapnwrfc.h>
 
 static SAP_UC* GoMallocU(unsigned size) {
@@ -289,11 +300,14 @@ func nWrapString(uc *C.SAP_UC, ucLen C.int, strip bool) (string, error) {
 	defer C.free(unsafe.Pointer(utf8Str))
 
 	resultLen := C.uint(0)
+
 	var errorInfo C.RFC_ERROR_INFO
-	rc := C.RfcSAPUCToUTF8(uc, C.uint(ucLen), utf8Str, &utf8Len, &resultLen, &errorInfo)
+	rc = C.RfcSAPUCToUTF8(uc, (C.uint)(length), (*C.RFC_BYTE)(unsafe.Pointer(utf8str)), &utf8Size, &resultLen, &errorInfo)
+
 	if rc != C.RFC_OK {
 		return "", rfcError(errorInfo, "failed to wrap C string: %s", errorInfo.message)
 	}
+
 	result := C.GoString((*C.char)(unsafe.Pointer(utf8Str)))
 
 	if strip {

gorfc/gorfc_test.go

@@ -28,9 +28,7 @@ func isValueInList(value string, list []string) bool {
 //
 func TestNWRFCLibVersion(t *testing.T) {
 	major, minor, patchlevel := GetNWRFCLibVersion()
-	assert.Equal(t, uint(7500), major) // adapt to your NW RFC Lib version
-	assert.Equal(t, uint(0), minor)
-	assert.Equal(t, uint(2), patchlevel)
+	assert.Equal(t, "7500.0.5", fmt.Sprintf("%d.%d.%d", major, minor, patchlevel)) // adapt to your NW RFC Lib version
 }
 
 //