diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 01:00:07 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-12-23 01:00:07 +0100 |
| commit | 119076c9300e2e2a816dc1a6ca32ba77f338b20c (patch) | |
| tree | 5eda85d136db5b739dd1d6c68b617f5f6821624a | |
| parent | 1dda55c79b90c27303628a42c7ad8d948d613146 (diff) | |
| download | xine-lib-119076c9300e2e2a816dc1a6ca32ba77f338b20c.tar.gz xine-lib-119076c9300e2e2a816dc1a6ca32ba77f338b20c.tar.bz2 | |
Fix merge mistake.
| -rw-r--r-- | src/xine-utils/utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index 8d7c405dc..f3c10a61b 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -274,8 +274,6 @@ void *xine_xcalloc(size_t nmemb, size_t size) { return ptr; } -} - void *xine_memdup (const void *src, size_t length) { void *dst = malloc (length); @@ -287,6 +285,8 @@ void *xine_memdup0 (const void *src, size_t length) char *dst = xine_xmalloc (length + 1); dst[length] = 0; return xine_fast_memcpy (dst, src, length); +} + #ifdef WIN32 /* * Parse command line with Windows XP syntax and copy the command (argv[0]). |