From 70ef58014f053005b5faeabf1c17d4ecb0389572 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 27 Aug 2015 01:36:22 -0500
Subject: [PATCH] Re-fix constant type to int64_t
---
pyopencl/cffi_cl.py | 2 +-
src/c_wrapper/wrap_cl_core.h | 2 +-
src/c_wrapper/wrap_constants.cpp | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/pyopencl/cffi_cl.py b/pyopencl/cffi_cl.py
index 367fe981..8c67c394 100644
--- a/pyopencl/cffi_cl.py
+++ b/pyopencl/cffi_cl.py
@@ -459,7 +459,7 @@ _locals = locals()
# TODO: constant values are cl_ulong
-@_ffi.callback('void (*)(const char*, const char* name, unsigned long value)')
+@_ffi.callback('void (*)(const char*, const char* name, int64_t value)')
def _constant_callback(type_, name, value):
setattr(_locals[_ffi_pystr(type_)], _ffi_pystr(name), value) # noqa
diff --git a/src/c_wrapper/wrap_cl_core.h b/src/c_wrapper/wrap_cl_core.h
index 0cae572a..6b53485b 100644
--- a/src/c_wrapper/wrap_cl_core.h
+++ b/src/c_wrapper/wrap_cl_core.h
@@ -56,7 +56,7 @@ void set_py_funcs(int (*_gc)(), void *(*_ref)(void*), void (*_deref)(void*),
int have_gl();
unsigned bitlog2(unsigned long v);
-void populate_constants(void(*add)(const char*, const char*, unsigned long value));
+void populate_constants(void(*add)(const char*, const char*, int64_t value));
int get_debug();
void set_debug(int debug);
diff --git a/src/c_wrapper/wrap_constants.cpp b/src/c_wrapper/wrap_constants.cpp
index 952d3b51..fa0695a6 100644
--- a/src/c_wrapper/wrap_constants.cpp
+++ b/src/c_wrapper/wrap_constants.cpp
@@ -2,7 +2,7 @@
#include <iostream>
extern "C"
-void populate_constants(void(*add)(const char*, const char*, unsigned long value))
+void populate_constants(void(*add)(const char*, const char*, int64_t value))
{
#define _ADD_ATTR(TYPE, PREFIX, NAME, SUFFIX, ...) \
add(TYPE, #NAME, CL_##PREFIX##NAME##SUFFIX)
--
GitLab