pocl

Merge lp:~schnetter/pocl/main into lp:~pocl/pocl/trunk

  1. main
  2. Merge into trunk
Proposed by Erik Schnetter
Status: Merged
Merged at revision: 262
Proposed branch: lp:~schnetter/pocl/main
Merge into: lp:~pocl/pocl/trunk
Diff against target: 35 lines (+3/-0)
3 files modified
lib/CL/clCreateProgramWithBinary.c (+1/-0)
lib/CL/clCreateProgramWithSource.c (+1/-0)
lib/CL/clReleaseProgram.c (+1/-0)
To merge this branch: bzr merge lp:~schnetter/pocl/main
Reviewer Review Type Date Requested Status
Pekka Jääskeläinen Pending
Review via email: mp+105283@code.launchpad.net

Description of the change

The current trunk segfaults for me (Mac OSX). This is because of missing #include files, leading to wrong implicitly defined return types for some functions. I have corrected this in my branch.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/CL/clCreateProgramWithBinary.c'
2--- lib/CL/clCreateProgramWithBinary.c 2012-05-03 11:06:37 +0000
3+++ lib/CL/clCreateProgramWithBinary.c 2012-05-09 23:50:23 +0000
4@@ -22,6 +22,7 @@
5 */
6
7 #include "pocl_cl.h"
8+#include "pocl_util.h"
9 #include <string.h>
10
11 CL_API_ENTRY cl_program CL_API_CALL
12
13=== modified file 'lib/CL/clCreateProgramWithSource.c'
14--- lib/CL/clCreateProgramWithSource.c 2012-04-23 11:17:52 +0000
15+++ lib/CL/clCreateProgramWithSource.c 2012-05-09 23:50:23 +0000
16@@ -23,6 +23,7 @@
17 */
18
19 #include "pocl_cl.h"
20+#include "pocl_util.h"
21 #include <string.h>
22
23 CL_API_ENTRY cl_program CL_API_CALL
24
25=== modified file 'lib/CL/clReleaseProgram.c'
26--- lib/CL/clReleaseProgram.c 2012-04-23 11:17:52 +0000
27+++ lib/CL/clReleaseProgram.c 2012-05-09 23:50:23 +0000
28@@ -25,6 +25,7 @@
29 #include <unistd.h>
30
31 #include "pocl_cl.h"
32+#include "pocl_util.h"
33
34 CL_API_ENTRY cl_int CL_API_CALL
35 clReleaseProgram(cl_program program) CL_API_SUFFIX__VERSION_1_0