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
=== modified file 'lib/CL/clCreateProgramWithBinary.c'
--- lib/CL/clCreateProgramWithBinary.c 2012-05-03 11:06:37 +0000
+++ lib/CL/clCreateProgramWithBinary.c 2012-05-09 23:50:23 +0000
@@ -22,6 +22,7 @@
22*/22*/
2323
24#include "pocl_cl.h"24#include "pocl_cl.h"
25#include "pocl_util.h"
25#include <string.h>26#include <string.h>
2627
27CL_API_ENTRY cl_program CL_API_CALL28CL_API_ENTRY cl_program CL_API_CALL
2829
=== modified file 'lib/CL/clCreateProgramWithSource.c'
--- lib/CL/clCreateProgramWithSource.c 2012-04-23 11:17:52 +0000
+++ lib/CL/clCreateProgramWithSource.c 2012-05-09 23:50:23 +0000
@@ -23,6 +23,7 @@
23*/23*/
2424
25#include "pocl_cl.h"25#include "pocl_cl.h"
26#include "pocl_util.h"
26#include <string.h>27#include <string.h>
2728
28CL_API_ENTRY cl_program CL_API_CALL29CL_API_ENTRY cl_program CL_API_CALL
2930
=== modified file 'lib/CL/clReleaseProgram.c'
--- lib/CL/clReleaseProgram.c 2012-04-23 11:17:52 +0000
+++ lib/CL/clReleaseProgram.c 2012-05-09 23:50:23 +0000
@@ -25,6 +25,7 @@
25#include <unistd.h>25#include <unistd.h>
2626
27#include "pocl_cl.h"27#include "pocl_cl.h"
28#include "pocl_util.h"
2829
29CL_API_ENTRY cl_int CL_API_CALL30CL_API_ENTRY cl_int CL_API_CALL
30clReleaseProgram(cl_program program) CL_API_SUFFIX__VERSION_1_031clReleaseProgram(cl_program program) CL_API_SUFFIX__VERSION_1_0