From 119076c9300e2e2a816dc1a6ca32ba77f338b20c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sun, 23 Dec 2007 01:00:07 +0100
Subject: Fix merge mistake.

---
 src/xine-utils/utils.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

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]).
-- 
cgit v1.2.3