aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoreschnett <eschnett@4054007a-4839-4648-a056-eb81e030d849>2012-05-05 13:33:41 +0000
committereschnett <eschnett@4054007a-4839-4648-a056-eb81e030d849>2012-05-05 13:33:41 +0000
commita8df43d43b3a929dced4015331d460de7b30cf9a (patch)
treeae77cb5aa1a5b0738a63d24981b6937e23ef382e
parent5d416ddef4f3fef78d7aaad9d8de7f2ce23627f8 (diff)
Update include files
git-svn-id: http://svn.cactuscode.org/projects/ExternalLibraries/OpenCL/trunk@8 4054007a-4839-4648-a056-eb81e030d849
-rw-r--r--src/device_info.c7
-rw-r--r--src/err_code.c7
-rw-r--r--src/info.c16
3 files changed, 16 insertions, 14 deletions
diff --git a/src/device_info.c b/src/device_info.c
index 28eb89b..ed87bee 100644
--- a/src/device_info.c
+++ b/src/device_info.c
@@ -18,10 +18,11 @@
#include <stdlib.h>
#include <string.h>
-#ifdef APPLE
-#include <OpenCL/opencl.h>
+
+#ifdef __APPLE__
+# include <OpenCL/opencl.h>
#else
-#include "CL/cl.h"
+# include <CL/cl.h>
#endif
// define VERBOSE if you want to print info about work groups sizes
diff --git a/src/err_code.c b/src/err_code.c
index d3de434..f2647a8 100644
--- a/src/err_code.c
+++ b/src/err_code.c
@@ -14,10 +14,11 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#ifdef APPLE
-#include <OpenCL/opencl.h>
+
+#ifdef __APPLE__
+# include <OpenCL/opencl.h>
#else
-#include "CL/cl.h"
+# include <CL/cl.h>
#endif
char *OpenCL_err_code (cl_int err_in);
diff --git a/src/info.c b/src/info.c
index 9c65bef..db98192 100644
--- a/src/info.c
+++ b/src/info.c
@@ -1,16 +1,16 @@
-#include <string.h>
-#include <math.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-
#include <cctk.h>
#include <cctk_Arguments.h>
#include <cctk_Parameters.h>
-#ifdef APPLE
-#include <OpenCL/opencl.h>
+#include <math.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#ifdef __APPLE__
+# include <OpenCL/opencl.h>
#else
-#include "CL/cl.h"
+# include <CL/cl.h>
#endif
// Two utility functions from "common"