---
It looks like these were missed in commit 2240ba10. This also removes the
last of the SUNOS4 defines; we can probably remove configs/sunos4* as well.
src/glu/mesa/gluP.h | 10 ----------
src/glu/mesa/nurbssrf.c | 4 ++--
src/glu/mesa/project.c | 2 +-
src/glu/mini/gluP.h | 10 ----------
src/glu/mini/project.c | 2 +-
5 files changed, 4 insertions(+), 24 deletions(-)
diff --git a/src/glu/mesa/gluP.h b/src/glu/mesa/gluP.h
index dc1b05b..11bf239 100644
--- a/src/glu/mesa/gluP.h
+++ b/src/glu/mesa/gluP.h
@@ -79,16 +79,6 @@
#define GLU_NO_ERROR GL_NO_ERROR
-/* for Sun: */
-#ifdef SUNOS4
-#define MEMCPY( DST, SRC, BYTES) \
- memcpy( (char *) (DST), (char *) (SRC), (int) (BYTES) )
-#else
-#define MEMCPY( DST, SRC, BYTES) \
- memcpy( (void *) (DST), (void *) (SRC), (size_t) (BYTES) )
-#endif
-
-
#ifndef NULL
# define NULL 0
#endif
diff --git a/src/glu/mesa/nurbssrf.c b/src/glu/mesa/nurbssrf.c
index d39fa47..7915e28 100644
--- a/src/glu/mesa/nurbssrf.c
+++ b/src/glu/mesa/nurbssrf.c
@@ -211,7 +211,7 @@ convert_surf(knot_str_type * s_knot, knot_str_type * t_knot,
}
for (i = 0; i < tmp_n_control; i++)
for (j = 0; j < t_cnt; j++)
- MEMCPY(*new_ctrl + j * dim + i * dim * t_cnt, tmp_ctrl[j] + dim * i,
+ memcpy(*new_ctrl + j * dim + i * dim * t_cnt, tmp_ctrl[j] + dim * i,
sizeof(GLfloat) * dim);
for (i = 0; i < t_cnt; i++)
free(tmp_ctrl[i]);
@@ -266,7 +266,7 @@ convert_surf(knot_str_type * s_knot, knot_str_type * t_knot,
return GLU_OUT_OF_MEMORY;
}
for (i = 0; i < (*s_n_ctrl); i++) {
- MEMCPY(*new_ctrl + i * tmp_stride, tmp_ctrl[i],
+ memcpy(*new_ctrl + i * tmp_stride, tmp_ctrl[i],
sizeof(GLfloat) * tmp_stride);
free(tmp_ctrl[i]);
}
diff --git a/src/glu/mesa/project.c b/src/glu/mesa/project.c
index 2e79cdf..1f007ec 100644
--- a/src/glu/mesa/project.c
+++ b/src/glu/mesa/project.c
@@ -105,7 +105,7 @@ matmul(GLdouble * product, const GLdouble * a, const
GLdouble * b)
#undef A
#undef B
#undef T
- MEMCPY(product, temp, 16 * sizeof(GLdouble));
+ memcpy(product, temp, 16 * sizeof(GLdouble));
}
diff --git a/src/glu/mini/gluP.h b/src/glu/mini/gluP.h
index a39edce..c7c8fb0 100644
--- a/src/glu/mini/gluP.h
+++ b/src/glu/mini/gluP.h
@@ -123,16 +123,6 @@ typedef struct tagPIXELFORMATDESCRIPTOR
PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
#define GLU_NO_ERROR GL_NO_ERROR
-/* for Sun: */
-#ifdef SUNOS4
-#define MEMCPY( DST, SRC, BYTES) \
- memcpy( (char *) (DST), (char *) (SRC), (int) (BYTES) )
-#else
-#define MEMCPY( DST, SRC, BYTES) \
- memcpy( (void *) (DST), (void *) (SRC), (size_t) (BYTES) )
-#endif
-
-
#ifndef NULL
# define NULL 0
#endif
diff --git a/src/glu/mini/project.c b/src/glu/mini/project.c
index 2e79cdf..1f007ec 100644
--- a/src/glu/mini/project.c
+++ b/src/glu/mini/project.c
@@ -105,7 +105,7 @@ matmul(GLdouble * product, const GLdouble * a, const
GLdouble * b)
#undef A
#undef B
#undef T
- MEMCPY(product, temp, 16 * sizeof(GLdouble));
+ memcpy(product, temp, 16 * sizeof(GLdouble));
}
--
1.7.0
------------------------------------------------------------------------------
Download Intel® Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Mesa3d-dev mailing list
Mesa3d-dev@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/mesa3d-dev
