diff options
| -rw-r--r-- | src/input/libdvdnav/diff_against_cvs.patch | 24 | ||||
| -rw-r--r-- | src/input/libdvdnav/md5.c | 10 |
2 files changed, 26 insertions, 8 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch index 299007c47..da00d8fd6 100644 --- a/src/input/libdvdnav/diff_against_cvs.patch +++ b/src/input/libdvdnav/diff_against_cvs.patch @@ -223,3 +223,27 @@ diff -u -r1.11 dvd_reader.c dev_name = strdup(me->mnt_fsname); break; } +Index: src/input/libdvdnav/md5.c +=================================================================== +RCS file: /cvsroot/xine/xine-lib/src/input/libdvdnav/md5.c,v +retrieving revision 1.2 +diff -u -r1.2 md5.c +--- src/input/libdvdnav/md5.c 29 Apr 2003 21:46:05 -0000 1.2 ++++ src/input/libdvdnav/md5.c 2 Jun 2006 19:14:50 -0000 +@@ -26,14 +26,8 @@ + + #include <sys/types.h> + +-#if STDC_HEADERS || defined _LIBC +-# include <stdlib.h> +-# include <string.h> +-#else +-# ifndef HAVE_MEMCPY +-# define memcpy(d, s, n) bcopy ((s), (d), (n)) +-# endif +-#endif ++#include <stdlib.h> ++#include <string.h> + + #include "md5.h" + /* #include "unlocked-io.h" */ diff --git a/src/input/libdvdnav/md5.c b/src/input/libdvdnav/md5.c index 3ee9abae5..2bfdddee4 100644 --- a/src/input/libdvdnav/md5.c +++ b/src/input/libdvdnav/md5.c @@ -26,14 +26,8 @@ #include <sys/types.h> -#if STDC_HEADERS || defined _LIBC -# include <stdlib.h> -# include <string.h> -#else -# ifndef HAVE_MEMCPY -# define memcpy(d, s, n) bcopy ((s), (d), (n)) -# endif -#endif +#include <stdlib.h> +#include <string.h> #include "md5.h" /* #include "unlocked-io.h" */ |