summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/xine-utils/xine_buffer.c7
-rw-r--r--src/xine-utils/xine_buffer.h4
2 files changed, 4 insertions, 7 deletions
diff --git a/src/xine-utils/xine_buffer.c b/src/xine-utils/xine_buffer.c
index 2ab70ea56..1af58c48a 100644
--- a/src/xine-utils/xine_buffer.c
+++ b/src/xine-utils/xine_buffer.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_buffer.c,v 1.2 2002/12/22 00:35:05 komadori Exp $
+ * $Id: xine_buffer.c,v 1.3 2002/12/24 00:59:36 holstsn Exp $
*
*
* generic dynamic buffer functions. The goals
@@ -60,9 +60,6 @@
#define CHECKS
-/* FIXME */
-#define xine_xmalloc(x) calloc(1,x)
-
/*
* private data structs
*/
@@ -180,7 +177,7 @@ new=xine_xmalloc(GET_HEADER(buf)->size+XINE_BUFFER_HEADER_SIZE);
*/
#define xine_buffer_copyin(buf,i,data,len) \
buf=_xine_buffer_copyin(buf,i,data,len)
-void *_xine_buffer_copyin(void *buf, int index, void *data, int len) {
+void *_xine_buffer_copyin(void *buf, int index, const void *data, int len) {
#ifdef CHECKS
if (!buf || !data) {
diff --git a/src/xine-utils/xine_buffer.h b/src/xine-utils/xine_buffer.h
index 6ef0e019a..1a9d682b0 100644
--- a/src/xine-utils/xine_buffer.h
+++ b/src/xine-utils/xine_buffer.h
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: xine_buffer.h,v 1.1 2002/12/15 01:47:59 holstsn Exp $
+ * $Id: xine_buffer.h,v 1.2 2002/12/24 00:59:36 holstsn Exp $
*
*
* generic dynamic buffer functions. The goals
@@ -79,7 +79,7 @@ void *xine_buffer_dup(void *buf);
*/
#define xine_buffer_copyin(buf,i,data,len) \
buf=_xine_buffer_copyin(buf,i,data,len)
-void *_xine_buffer_copyin(void *buf, int index, void *data, int len);
+void *_xine_buffer_copyin(void *buf, int index, const void *data, int len);
/*
* will copy len bytes out of buf+index into data.