aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWade Walker <[email protected]>2014-03-02 12:16:42 -0600
committerWade Walker <[email protected]>2014-03-02 12:16:42 -0600
commit9d6418135370a8ce1d5c63196011b1354a8e8022 (patch)
tree0e42d6595e4921de05659d6d4182ceefff41c63f
parent7711ab577405415b7c176455a152a1cbc4dff5f7 (diff)
Fix C build warnings.
Fixes -fno-rtti and implicit cast warnings. After this commit, all C warnings are gone except for one due to gluegen emitting char pointers instead of unsigned char pointers.
-rw-r--r--make/build.xml3
-rw-r--r--make/config/clImplCustomCode.c4
2 files changed, 3 insertions, 4 deletions
diff --git a/make/build.xml b/make/build.xml
index 0f796e3a..ff903aa8 100644
--- a/make/build.xml
+++ b/make/build.xml
@@ -625,8 +625,7 @@
optimize="${c.compiler.optimise}"
debug="${c.compiler.debug}"
multithreaded="true"
- exceptions="false"
- rtti="false">
+ exceptions="false">
<fileset dir="${project.root}">
<patternset refid="c.src.files"/>
diff --git a/make/config/clImplCustomCode.c b/make/config/clImplCustomCode.c
index 6a5da4f0..a19cd400 100644
--- a/make/config/clImplCustomCode.c
+++ b/make/config/clImplCustomCode.c
@@ -407,7 +407,7 @@ JNIEXPORT jint JNICALL
Java_com_jogamp_opencl_llb_impl_CLImpl_clSetEventCallback0(JNIEnv *env, jobject _unused,
jlong event, jint trigger, jobject listener, jlong procAddress) {
- cl_event _event = event;
+ cl_event _event = (cl_event)event;
cl_int _trigger = trigger;
cl_int _res;
typedef int32_t (*function)(cl_event, cl_int, void (*pfn_event_notify) (cl_event, cl_int, void *), void *);
@@ -423,7 +423,7 @@ JNIEXPORT jint JNICALL
Java_com_jogamp_opencl_llb_impl_CLImpl_clSetMemObjectDestructorCallback0(JNIEnv *env, jobject _unused,
jlong mem, jobject listener, jlong procAddress) {
- cl_mem _mem = mem;
+ cl_mem _mem = (cl_mem)mem;
cl_int _res;
typedef int32_t (*function)(cl_mem, void (*pfn_event_notify) (cl_mem, void *), void *);
function clSetMemObjectDestructorCallback = (function)(intptr_t) procAddress;