* doc/liboil-sections.txt:

* doc/tmpl/liboil-unused.sgml:
* doc/tmpl/liboiltypes.sgml:
* liboil/conv/conv_c.c:
* liboil/liboilprototype.c:
* liboil/liboiltypes.h:
* liboil/ref/clip_ref.c:
* liboil/ref/conv.c:
* liboil/ref/multsum.c:
* liboil/ref/permute.c:
* liboil/ref/scalaradd.c:
* liboil/ref/scalarmult.c:
* liboil/ref/trans8x8.c:
* liboil/ref/vectoradd_f64.c:
* liboil/ref/vectoradd_s.c:
* liboil/simdpack/scalaradd.c:
* liboil/simdpack/scalarmult.c:

9 files changed, 126 insertions, 126 deletions

diff --git a/liboil/ref/clip_ref.c b/liboil/ref/clip_ref.c
index c606e28..7f109b3 100644
--- a/liboil/ref/clip_ref.c
+++ b/liboil/ref/clip_ref.c
@@ -39,42 +39,42 @@
  */
 #define CLIP_DEFINE_REF(type) \
 static void clip_ ## type ## _ref ( \
-    type_ ## type *dest, \
+    oil_type_ ## type *dest, \
     int dstr, \
-    type_ ## type *src, \
+    oil_type_ ## type *src, \
     int sstr, int n, \
-    type_ ## type *min, type_ ## type *max) \
+    oil_type_ ## type *min, oil_type_ ## type *max) \
 { \
   int i; \
-  type_ ## type x; \
+  oil_type_ ## type x; \
   for(i=0;i<n;i++){ \
-    x = OIL_GET(src,i*sstr,type_ ## type); \
+    x = OIL_GET(src,i*sstr,oil_type_ ## type); \
     if (x<*min) x = *min; \
     if (x>*max) x = *max; \
-    OIL_GET(dest,i*dstr,type_ ## type) = x; \
+    OIL_GET(dest,i*dstr,oil_type_ ## type) = x; \
   } \
 } \
 static void clip_ ## type ## _test (OilTest *test) \
 { \
-  type_ ## type *lo = (type_ ## type *) \
+  oil_type_ ## type *lo = (oil_type_ ## type *) \
     (test->params[OIL_ARG_SRC2].src_data + \
      test->params[OIL_ARG_SRC2].test_header); \
-  type_ ## type *hi = (type_ ## type *) \
+  oil_type_ ## type *hi = (oil_type_ ## type *) \
     (test->params[OIL_ARG_SRC3].src_data + \
      test->params[OIL_ARG_SRC3].test_header); \
   if (*lo > *hi) { \
-    type_ ## type tmp; \
+    oil_type_ ## type tmp; \
     tmp = *lo; \
     *lo = *hi; \
     *hi = tmp; \
   } \
 } \
 OIL_DEFINE_CLASS_FULL(clip_ ## type, \
-    "type_" #type " *dest, " \
+    "oil_type_" #type " *dest, " \
     "int dstr, " \
-    "type_" #type " *src, " \
+    "oil_type_" #type " *src, " \
     "int sstr, int n, " \
-    "type_" #type " *s2_1, type_" #type " *s3_1", \
+    "oil_type_" #type " *s2_1, oil_type_" #type " *s3_1", \
     clip_ ## type ## _test); \
 OIL_DEFINE_IMPL_REF(clip_ ## type ## _ref, clip_ ## type)
 
diff --git a/liboil/ref/conv.c b/liboil/ref/conv.c
index 2ea0a3b..bea4337 100644
--- a/liboil/ref/conv.c
+++ b/liboil/ref/conv.c
@@ -63,42 +63,42 @@
 
 #define CONV_DEFINE_REF_CAST(desttype,srctype) \
 static void conv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
+	oil_type_ ## desttype *dest,	\
 	int dest_stride,		\
-	type_ ## srctype *src,		\
+	oil_type_ ## srctype *src,		\
 	int src_stride, int n)	 	\
 {					\
 	int i;				\
 	for(i=0;i<n;i++){		\
-		OIL_GET(dest,i*dest_stride, type_ ## desttype) = \
-			OIL_GET(src,i*src_stride, type_ ## srctype);	\
+		OIL_GET(dest,i*dest_stride, oil_type_ ## desttype) = \
+			OIL_GET(src,i*src_stride, oil_type_ ## srctype);	\
 	}				\
 }					\
 OIL_DEFINE_CLASS(conv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
+	"oil_type_" #desttype " *dest, "	\
 	"int dstr, "			\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int sstr, int n");	 	\
 OIL_DEFINE_IMPL_REF(conv_ ## desttype ## _ ## srctype ## _ref,	\
 	conv_ ## desttype ## _ ## srctype)
 
 #define CONV_DEFINE_FLOAT_REF(desttype,srctype) \
 static void conv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
+	oil_type_ ## desttype *dest,	\
 	int dest_stride,		\
-	type_ ## srctype *src,		\
+	oil_type_ ## srctype *src,		\
 	int src_stride, int n) 		\
 {					\
 	int i;				\
 	for(i=0;i<n;i++){		\
-		OIL_GET(dest,i*dest_stride, type_ ## desttype) =		\
-			rint(OIL_GET(src,i*src_stride, type_ ## srctype));	\
+		OIL_GET(dest,i*dest_stride, oil_type_ ## desttype) =		\
+			rint(OIL_GET(src,i*src_stride, oil_type_ ## srctype));	\
 	}				\
 }					\
 OIL_DEFINE_CLASS(conv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
+	"oil_type_" #desttype " *dest, "	\
 	"int dstr, "			\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int sstr, int n");	 	\
 OIL_DEFINE_IMPL_REF(conv_ ## desttype ## _ ## srctype ## _ref,	\
 	conv_ ## desttype ## _ ## srctype)
@@ -172,94 +172,94 @@ CONV_DEFINE_REF_CAST(f64,f32);
 
 #define CLIPCONV_DEFINE_BOTH_REF(desttype,srctype) \
 static void clipconv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
+	oil_type_ ## desttype *dest,	\
 	int dest_stride,		\
-	type_ ## srctype *src,		\
+	oil_type_ ## srctype *src,		\
 	int src_stride, int n)		\
 {					\
 	int i;				\
-	type_ ## srctype x;		\
+	oil_type_ ## srctype x;		\
 	for(i=0;i<n;i++){		\
-		x = OIL_GET(src,i*src_stride, type_ ## srctype);			\
-		if(x<type_min_ ## desttype) x=type_min_ ## desttype;	\
-		if(x>type_max_ ## desttype) x=type_max_ ## desttype;	\
-		OIL_GET(dest,i*dest_stride, type_ ## desttype) = x;			\
+		x = OIL_GET(src,i*src_stride, oil_type_ ## srctype);			\
+		if(x<oil_type_min_ ## desttype) x=oil_type_min_ ## desttype;	\
+		if(x>oil_type_max_ ## desttype) x=oil_type_max_ ## desttype;	\
+		OIL_GET(dest,i*dest_stride, oil_type_ ## desttype) = x;			\
 	}				\
 }					\
 OIL_DEFINE_CLASS(clipconv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
+	"oil_type_" #desttype " *dest, "	\
 	"int dstr, "			\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int sstr, int n");	 	\
 OIL_DEFINE_IMPL_REF(clipconv_ ## desttype ## _ ## srctype ## _ref,	\
 	clipconv_ ## desttype ## _ ## srctype)
 
 #define CLIPCONV_DEFINE_UPPER_REF(desttype,srctype) \
 static void clipconv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
+	oil_type_ ## desttype *dest,	\
 	int dest_stride,		\
-	type_ ## srctype *src,		\
+	oil_type_ ## srctype *src,		\
 	int src_stride, int n)		\
 {					\
 	int i;				\
-	type_ ## srctype x;		\
+	oil_type_ ## srctype x;		\
 	for(i=0;i<n;i++){		\
-		x = OIL_GET(src,i*src_stride, type_ ## srctype);			\
-		if(x>type_max_ ## desttype) x=type_max_ ## desttype;	\
-		OIL_GET(dest,i*dest_stride, type_ ## desttype) = x;			\
+		x = OIL_GET(src,i*src_stride, oil_type_ ## srctype);			\
+		if(x>oil_type_max_ ## desttype) x=oil_type_max_ ## desttype;	\
+		OIL_GET(dest,i*dest_stride, oil_type_ ## desttype) = x;			\
 	}				\
 }					\
 OIL_DEFINE_CLASS(clipconv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
+	"oil_type_" #desttype " *dest, "	\
 	"int dstr, "			\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int sstr, int n");	 	\
 OIL_DEFINE_IMPL_REF(clipconv_ ## desttype ## _ ## srctype ## _ref,	\
 	clipconv_ ## desttype ## _ ## srctype)
 
 #define CLIPCONV_DEFINE_LOWER_REF(desttype,srctype) \
 static void clipconv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
+	oil_type_ ## desttype *dest,	\
 	int dest_stride,		\
-	type_ ## srctype *src,		\
+	oil_type_ ## srctype *src,		\
 	int src_stride, int n)		\
 {					\
 	int i;				\
-	type_ ## srctype x;		\
+	oil_type_ ## srctype x;		\
 	for(i=0;i<n;i++){		\
-		x = OIL_GET(src,i*src_stride, type_ ## srctype);			\
-		if(x<type_min_ ## desttype) x=type_min_ ## desttype;	\
-		OIL_GET(dest,i*dest_stride, type_ ## desttype) = x;			\
+		x = OIL_GET(src,i*src_stride, oil_type_ ## srctype);			\
+		if(x<oil_type_min_ ## desttype) x=oil_type_min_ ## desttype;	\
+		OIL_GET(dest,i*dest_stride, oil_type_ ## desttype) = x;			\
 	}				\
 }					\
 OIL_DEFINE_CLASS(clipconv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
+	"oil_type_" #desttype " *dest, "	\
 	"int dstr, "			\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int sstr, int n");	 	\
 OIL_DEFINE_IMPL_REF(clipconv_ ## desttype ## _ ## srctype ## _ref,	\
 	clipconv_ ## desttype ## _ ## srctype)
 
 #define CLIPCONV_DEFINE_FLOAT_REF(desttype,srctype) \
 static void clipconv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
+	oil_type_ ## desttype *dest,	\
 	int dest_stride,		\
-	type_ ## srctype *src,		\
+	oil_type_ ## srctype *src,		\
 	int src_stride, int n)		\
 {					\
 	int i;				\
-	type_ ## srctype x;		\
+	oil_type_ ## srctype x;		\
 	for(i=0;i<n;i++){		\
-		x = OIL_GET(src,i*src_stride, type_ ## srctype);			\
-		if(x<type_min_ ## desttype) x=type_min_ ## desttype;	\
-		if(x>type_max_ ## desttype) x=type_max_ ## desttype;	\
-		OIL_GET(dest,i*dest_stride, type_ ## desttype) = rint(x);		\
+		x = OIL_GET(src,i*src_stride, oil_type_ ## srctype);			\
+		if(x<oil_type_min_ ## desttype) x=oil_type_min_ ## desttype;	\
+		if(x>oil_type_max_ ## desttype) x=oil_type_max_ ## desttype;	\
+		OIL_GET(dest,i*dest_stride, oil_type_ ## desttype) = rint(x);		\
 	}				\
 }					\
 OIL_DEFINE_CLASS(clipconv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
+	"oil_type_" #desttype " *dest, "	\
 	"int dstr, "			\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int sstr, int n");	 	\
 OIL_DEFINE_IMPL_REF(clipconv_ ## desttype ## _ ## srctype ## _ref,	\
 	clipconv_ ## desttype ## _ ## srctype)
@@ -306,30 +306,30 @@ CLIPCONV_DEFINE_FLOAT_REF(u32,f64);
 
 #define SCALECONV_DEFINE_REF_RINT(desttype,srctype) \
 static void scaleconv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
-	type_ ## srctype *src,		\
+	oil_type_ ## desttype *dest,	\
+	oil_type_ ## srctype *src,		\
 	int n, double *offset, double *multiplier) \
 {					\
 	int i;				\
         double x;                       \
 	for(i=0;i<n;i++){		\
 		x = *offset + *multiplier * src[i];	\
-		if(x<type_min_ ## desttype) x=type_min_ ## desttype;	\
-		if(x>type_max_ ## desttype) x=type_max_ ## desttype;	\
+		if(x<oil_type_min_ ## desttype) x=oil_type_min_ ## desttype;	\
+		if(x>oil_type_max_ ## desttype) x=oil_type_max_ ## desttype;	\
 		dest[i] = rint(x);	\
 	}				\
 }					\
 OIL_DEFINE_CLASS(scaleconv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #desttype " *dest, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int n, double *s2_1, double *s3_1"); \
 OIL_DEFINE_IMPL_REF(scaleconv_ ## desttype ## _ ## srctype ## _ref,	\
 	scaleconv_ ## desttype ## _ ## srctype)
 
 #define SCALECONV_DEFINE_REF_CAST(desttype,srctype) \
 static void scaleconv_ ## desttype ## _ ## srctype ## _ref ( \
-	type_ ## desttype *dest,	\
-	type_ ## srctype *src,		\
+	oil_type_ ## desttype *dest,	\
+	oil_type_ ## srctype *src,		\
 	int n, double *offset, double *multiplier) \
 {					\
 	int i;				\
@@ -338,8 +338,8 @@ static void scaleconv_ ## desttype ## _ ## srctype ## _ref ( \
 	}				\
 }					\
 OIL_DEFINE_CLASS(scaleconv_ ## desttype ## _ ## srctype,	\
-	"type_" #desttype " *dest, "	\
-	"type_" #srctype " *src, "	\
+	"oil_type_" #desttype " *dest, "	\
+	"oil_type_" #srctype " *src, "	\
 	"int n, double *s2_1, double *s3_1"); \
 OIL_DEFINE_IMPL_REF(scaleconv_ ## desttype ## _ ## srctype ## _ref,	\
 	scaleconv_ ## desttype ## _ ## srctype)
diff --git a/liboil/ref/multsum.c b/liboil/ref/multsum.c
index e8eb478..dc8e0cd 100644
--- a/liboil/ref/multsum.c
+++ b/liboil/ref/multsum.c
@@ -36,18 +36,18 @@
 
 #define MULTSUM_DEFINE_REF(type)	\
 static void multsum_ ## type ## _ref(	\
-    type_ ## type *dest,		\
-    type_ ## type *src1, int sstr1,	\
-    type_ ## type *src2, int sstr2,	\
+    oil_type_ ## type *dest,		\
+    oil_type_ ## type *src1, int sstr1,	\
+    oil_type_ ## type *src2, int sstr2,	\
     int n)				\
 {					\
   int i;				\
   double sum = 0;			\
   double errsum = 0;			\
   for(i=0;i<n;i++){			\
-    type_ ## type x;                    \
-    type_ ## type tmp;                  \
-    x = OIL_GET(src1,sstr1*i,type_ ## type) * OIL_GET(src2,sstr2*i,type_ ## type);		\
+    oil_type_ ## type x;                    \
+    oil_type_ ## type tmp;                  \
+    x = OIL_GET(src1,sstr1*i,oil_type_ ## type) * OIL_GET(src2,sstr2*i,oil_type_ ## type);		\
     tmp = sum;				\
     sum += x;				\
     errsum += (tmp - sum) + x;		\
@@ -56,9 +56,9 @@ static void multsum_ ## type ## _ref(	\
 }					\
 OIL_DEFINE_IMPL_REF (multsum_ ## type ## _ref, multsum_ ## type); \
 OIL_DEFINE_CLASS (multsum_ ## type, \
-    "type_" #type " *dest, "		\
-    "type_" #type " *src1, int sstr1, "	\
-    "type_" #type " *src2, int sstr2, "	\
+    "oil_type_" #type " *dest, "		\
+    "oil_type_" #type " *src1, int sstr1, "	\
+    "oil_type_" #type " *src2, int sstr2, "	\
     "int n")
 
 /**
diff --git a/liboil/ref/permute.c b/liboil/ref/permute.c
index 6df6b2c..e1c14f0 100644
--- a/liboil/ref/permute.c
+++ b/liboil/ref/permute.c
@@ -52,19 +52,19 @@ permute_test (OilTest *test)
 
 #define PERMUTE_DEFINE_REF(type)		\
 static void permute_ ## type ## _ref(		\
-    type_ ## type *dest, int dstr,		\
-    type_ ## type *src1, int sstr1,		\
+    oil_type_ ## type *dest, int dstr,		\
+    oil_type_ ## type *src1, int sstr1,		\
     int32_t *src2, int sstr2, int n)		\
 {						\
   int i;					\
   for(i=0;i<n;i++){				\
-    OIL_GET(dest,dstr*i, type_ ## type) = OIL_GET(src1,sstr1*	\
-	OIL_GET(src2,sstr2*i, int), type_ ## type);		\
+    OIL_GET(dest,dstr*i, oil_type_ ## type) = OIL_GET(src1,sstr1*	\
+	OIL_GET(src2,sstr2*i, int), oil_type_ ## type);		\
   }						\
 }						\
 OIL_DEFINE_IMPL_REF (permute_ ## type ## _ref, permute_ ## type); \
-OIL_DEFINE_CLASS_FULL (permute_ ## type, "type_" #type " *dest, int dstr, " \
-    "type_" #type " *src1, int sstr1, int32_t *src2, int sstr2, int n", \
+OIL_DEFINE_CLASS_FULL (permute_ ## type, "oil_type_" #type " *dest, int dstr, " \
+    "oil_type_" #type " *src1, int sstr1, int32_t *src2, int sstr2, int n", \
     permute_test)
 
 /**
diff --git a/liboil/ref/scalaradd.c b/liboil/ref/scalaradd.c
index e4aa1da..9d46686 100644
--- a/liboil/ref/scalaradd.c
+++ b/liboil/ref/scalaradd.c
@@ -34,20 +34,20 @@
 
 #define SCALARADD_DEFINE_REF(type)		\
 static void scalaradd_ ## type ## _ref(		\
-    type_ ## type *dest, int dstr,		\
-    type_ ## type *src, int sstr,		\
-    type_ ## type *val, int n)			\
+    oil_type_ ## type *dest, int dstr,		\
+    oil_type_ ## type *src, int sstr,		\
+    oil_type_ ## type *val, int n)			\
 {						\
   int i;					\
   for(i=0;i<n;i++){				\
-    OIL_GET(dest,dstr*i, type_ ## type) =       \
-      OIL_GET(src,sstr*i, type_ ## type) + *val; \
+    OIL_GET(dest,dstr*i, oil_type_ ## type) =       \
+      OIL_GET(src,sstr*i, oil_type_ ## type) + *val; \
   }						\
 }						\
 OIL_DEFINE_CLASS (scalaradd_ ## type,         \
-    "type_" #type " *d, int dstr, "		\
-    "type_" #type " *s1, int sstr, "		\
-    "type_" #type " *s2_1 int n");		\
+    "oil_type_" #type " *d, int dstr, "		\
+    "oil_type_" #type " *s1, int sstr, "		\
+    "oil_type_" #type " *s2_1 int n");		\
 OIL_DEFINE_IMPL_REF (scalaradd_ ## type ## _ref, scalaradd_ ## type);
 
 
diff --git a/liboil/ref/scalarmult.c b/liboil/ref/scalarmult.c
index 0a5e0f7..ab390bb 100644
--- a/liboil/ref/scalarmult.c
+++ b/liboil/ref/scalarmult.c
@@ -34,19 +34,19 @@
 
 #define SCALARMULT_DEFINE_REF(type)		\
 static void scalarmult_ ## type ## _ref(	\
-    type_ ## type *dest, int dstr,		\
-    type_ ## type *src, int sstr,		\
-    type_ ## type *val, int n)			\
+    oil_type_ ## type *dest, int dstr,		\
+    oil_type_ ## type *src, int sstr,		\
+    oil_type_ ## type *val, int n)			\
 {						\
   int i;					\
   for(i=0;i<n;i++){				\
-    OIL_GET(dest,dstr*i,type_ ## type) = OIL_GET(src,sstr*i,type_ ## type) * *val; \
+    OIL_GET(dest,dstr*i,oil_type_ ## type) = OIL_GET(src,sstr*i,oil_type_ ## type) * *val; \
   }						\
 }						\
 OIL_DEFINE_CLASS(scalarmult_ ## type,           \
-    "type_" #type " *d, int dstr, "          \
-    "type_" #type " *s1, int sstr, "           \
-    "type_" #type " *s2_1, int n");            \
+    "oil_type_" #type " *d, int dstr, "          \
+    "oil_type_" #type " *s1, int sstr, "           \
+    "oil_type_" #type " *s2_1, int n");            \
 OIL_DEFINE_IMPL_REF (scalarmult_ ## type ## _ref, scalarmult_ ## type);
 
 
diff --git a/liboil/ref/trans8x8.c b/liboil/ref/trans8x8.c
index b7787fd..ae91d8f 100644
--- a/liboil/ref/trans8x8.c
+++ b/liboil/ref/trans8x8.c
@@ -34,19 +34,19 @@
 
 #define TRANS8x8_DEFINE_REF(type)		\
 static void trans8x8_ ## type ## _ref (		\
-    type_ ## type *dest, int dstr,		\
-    type_ ## type *src, int sstr)		\
+    oil_type_ ## type *dest, int dstr,		\
+    oil_type_ ## type *src, int sstr)		\
 {						\
   int i,j;					\
   for(i=0;i<8;i++){				\
     for(j=0;j<8;j++){				\
-      OIL_GET(dest,dstr*i+j*sizeof(type_ ## type),type_ ## type) = \
-        OIL_GET(src,sstr*j+i*sizeof(type_ ## type),type_ ## type); \
+      OIL_GET(dest,dstr*i+j*sizeof(oil_type_ ## type),oil_type_ ## type) = \
+        OIL_GET(src,sstr*j+i*sizeof(oil_type_ ## type),oil_type_ ## type); \
     }						\
   }						\
 }						\
-OIL_DEFINE_CLASS (trans8x8_ ## type, "type_" #type " *d_8x8, int ds,	" \
-    "type_" #type " *s_8x8, int ss"); \
+OIL_DEFINE_CLASS (trans8x8_ ## type, "oil_type_" #type " *d_8x8, int ds,	" \
+    "oil_type_" #type " *s_8x8, int ss"); \
 OIL_DEFINE_IMPL_REF (trans8x8_ ## type ## _ref, trans8x8_ ## type)
 
 TRANS8x8_DEFINE_REF(u8);
diff --git a/liboil/ref/vectoradd_f64.c b/liboil/ref/vectoradd_f64.c
index b6f94f8..ed2e565 100644
--- a/liboil/ref/vectoradd_f64.c
+++ b/liboil/ref/vectoradd_f64.c
@@ -35,22 +35,22 @@
 
 #define VECTORADD_DEFINE(type)		\
 static void vectoradd_ ## type ## _ref (	\
-    type_ ## type *dest, int dstr,		\
-    type_ ## type *src1, int sstr1,		\
-    type_ ## type *src2, int sstr2,		\
-    int n, type_ ## type *v1, type_ ## type *v2) \
+    oil_type_ ## type *dest, int dstr,		\
+    oil_type_ ## type *src1, int sstr1,		\
+    oil_type_ ## type *src2, int sstr2,		\
+    int n, oil_type_ ## type *v1, oil_type_ ## type *v2) \
 {						\
   int i;					\
   for(i=0;i<n;i++) {				\
-    OIL_GET(dest,i*dstr, type_ ## type) = *v1 * OIL_GET(src1,i*sstr1, type_ ## type) +	\
-        *v2 * OIL_GET(src2,i*sstr2, type_ ## type);		\
+    OIL_GET(dest,i*dstr, oil_type_ ## type) = *v1 * OIL_GET(src1,i*sstr1, oil_type_ ## type) +	\
+        *v2 * OIL_GET(src2,i*sstr2, oil_type_ ## type);		\
   }						\
 }						\
 OIL_DEFINE_CLASS (vectoradd_ ## type,         \
-    "type_" #type " *d, int dstr, "		\
-    "type_" #type " *s1, int sstr1, "		\
-    "type_" #type " *s2, int sstr2, "		\
-    "int n, type_" #type " *s3_1, type_" #type " *s4_1");	\
+    "oil_type_" #type " *d, int dstr, "		\
+    "oil_type_" #type " *s1, int sstr1, "		\
+    "oil_type_" #type " *s2, int sstr2, "		\
+    "int n, oil_type_" #type " *s3_1, oil_type_" #type " *s4_1");	\
 OIL_DEFINE_IMPL_REF (vectoradd_ ## type ## _ref, vectoradd_ ## type);
 
 /**
diff --git a/liboil/ref/vectoradd_s.c b/liboil/ref/vectoradd_s.c
index 19f8724..2f3c17b 100644
--- a/liboil/ref/vectoradd_s.c
+++ b/liboil/ref/vectoradd_s.c
@@ -33,28 +33,28 @@
 #include <liboil/simdpack/simdpack.h>
 
 #define CLAMP(x, low, high)  (((x) > (high)) ? (high) : (((x) < (low)) ? (low) : (x)))
-#define type_min_f32 -1.0
-#define type_max_f32 1.0
-#define type_min_f64 -1.0
-#define type_max_f64 1.0
+#define oil_type_min_f32 -1.0
+#define oil_type_max_f32 1.0
+#define oil_type_min_f64 -1.0
+#define oil_type_max_f64 1.0
 
 #define VECTORADD_S_DEFINE_IMPL(type,bigger)		\
 static void vectoradd_s_ ## type ## _ref (	\
-    type_ ## type *dest, int dstr,		\
-    type_ ## type *src1, int sstr1,		\
-    type_ ## type *src2, int sstr2,		\
+    oil_type_ ## type *dest, int dstr,		\
+    oil_type_ ## type *src1, int sstr1,		\
+    oil_type_ ## type *src2, int sstr2,		\
     int n) \
 {						\
   int i;					\
   for(i=0;i<n;i++) {				\
-    OIL_GET(dest,i*dstr, type_ ## type) = CLAMP((type_ ## bigger)OIL_GET(src1,i*sstr1, type_ ## type) +	\
-        (type_ ## bigger)OIL_GET(src2,i*sstr2, type_ ## type),type_min_ ## type, type_max_ ## type);		\
+    OIL_GET(dest,i*dstr, oil_type_ ## type) = CLAMP((oil_type_ ## bigger)OIL_GET(src1,i*sstr1, oil_type_ ## type) +	\
+        (oil_type_ ## bigger)OIL_GET(src2,i*sstr2, oil_type_ ## type),oil_type_min_ ## type, oil_type_max_ ## type);		\
   }						\
 }						\
 OIL_DEFINE_CLASS (vectoradd_s_ ## type,         \
-    "type_" #type " *d, int dstr, "		\
-    "type_" #type " *s1, int sstr1, "		\
-    "type_" #type " *s2, int sstr2, "		\
+    "oil_type_" #type " *d, int dstr, "		\
+    "oil_type_" #type " *s1, int sstr1, "		\
+    "oil_type_" #type " *s2, int sstr2, "		\
     "int n");	\
 OIL_DEFINE_IMPL_REF (vectoradd_s_ ## type ## _ref, vectoradd_s_ ## type);