diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:16:14 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2015-10-22 20:16:14 +0300 |
| commit | 83a2d3dcf5a73f907c741038d5c55cb9f7aff1f9 (patch) | |
| tree | 46e8c12b29369072f487de5920f33a3e7148176e /extern/clew/include/clew.h | |
| parent | 9f8eb0e1eb220015f0cff530bcb0491828f05c99 (diff) | |
| parent | 6bc007610263c879f6bb30b844ba9d9a0fb9433c (diff) | |
Merge branch 'master' into UI-experiments
Conflicts:
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/intern/customdata.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/resources.c
source/blender/editors/transform/transform_manipulator.c
source/blender/windowmanager/intern/wm_init_exit.c
Diffstat (limited to 'extern/clew/include/clew.h')
| -rw-r--r-- | extern/clew/include/clew.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extern/clew/include/clew.h b/extern/clew/include/clew.h index 1b72f813c9f..60a7c8fba98 100644 --- a/extern/clew/include/clew.h +++ b/extern/clew/include/clew.h @@ -2781,7 +2781,7 @@ CLEW_FUN_EXPORT PFNCLGETGLCONTEXTINFOKHR __clewGetGLContextInfoKH #define CLEW_ERROR_ATEXIT_FAILED -2 //!< Error code for failing to queue the closing of the dynamic library to atexit() //! \brief Load OpenCL dynamic library and set function entry points -int clewInit (); +int clewInit (void); //! \brief Convert an OpenCL error code to its string equivalent const char* clewErrorString (cl_int error); |