summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-19 03:06:12 +0100
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2007-12-19 03:06:12 +0100
commitdba3aa42580ef3e9cba57df71a231bc00679c551 (patch)
tree2f2d45468bb5669b4a0e1e95a2369479715e60ac /include
parent916fbee057ef45a6b7b9dbee93784b16820f6b95 (diff)
parent75b8595548ee1796fd81e2b5a0a3bc99ee74265d (diff)
downloadxine-lib-dba3aa42580ef3e9cba57df71a231bc00679c551.tar.gz
xine-lib-dba3aa42580ef3e9cba57df71a231bc00679c551.tar.bz2
Merge from 1.2 branch.
--HG-- rename : src/xine-utils/xineutils.h => include/xine/xineutils.h
Diffstat (limited to 'include')
-rw-r--r--include/xine/xineutils.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/xine/xineutils.h b/include/xine/xineutils.h
index 4ff87e87c..89c62676b 100644
--- a/include/xine/xineutils.h
+++ b/include/xine/xineutils.h
@@ -633,6 +633,12 @@ void *xine_xcalloc(size_t nmemb, size_t size) XINE_MALLOC XINE_PROTECTED;
void *xine_xmalloc_aligned(size_t alignment, size_t size, void **base) XINE_PROTECTED;
/*
+ * Copy blocks of memory.
+ */
+void *xine_memdup (const void *src, size_t length) XINE_MALLOC XINE_PROTECTED;
+void *xine_memdup0 (const void *src, size_t length) XINE_MALLOC XINE_PROTECTED;
+
+/*
* Get user home directory.
*/
const char *xine_get_homedir(void) XINE_PROTECTED;