From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 5 May 2019 23:24:39 +0000 (+1200)
Subject: pidl: Call PyLong_FromLongLong() directly rather than via inline helper
X-Git-Url: http://git.samba.org/samba.git/?p=gd%2Fsamba-autobuild%2F.git;a=commitdiff_plain;h=819ee849cb198ebdedb6458f2f6dc7e958533337;ds=sidebyside

pidl: Call PyLong_FromLongLong() directly rather than via inline helper

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/pidl/lib/Parse/Pidl/Samba4/Python.pm b/pidl/lib/Parse/Pidl/Samba4/Python.pm
index d01bce28b50..6bf71d86b38 100644
--- a/pidl/lib/Parse/Pidl/Samba4/Python.pm
+++ b/pidl/lib/Parse/Pidl/Samba4/Python.pm
@@ -2025,7 +2025,7 @@ sub ConvertScalarToPython($$$$)
 	$ctypename = expandAlias($ctypename);
 
 	if ($ctypename =~ /^(int64|dlong)$/) {
-		return "ndr_PyLong_FromLongLong($cvar)";
+		return "PyLong_FromLongLong($cvar)";
 	}
 
 	if ($ctypename =~ /^(uint64|hyper|NTTIME_hyper|NTTIME|NTTIME_1sec|udlong|udlongr|uid_t|gid_t)$/) {
@@ -2316,11 +2316,6 @@ static inline long long ndr_sizeof2intmax(size_t var_size)
 	return 0;
 }
 
-static inline PyObject *ndr_PyLong_FromLongLong(long long v)
-{
-	return PyLong_FromLongLong(v);
-}
-
 static inline PyObject *ndr_PyLong_FromUnsignedLongLong(unsigned long long v)
 {
 	return PyLong_FromUnsignedLongLong(v);