Merged cptspiff's code-reshuffle branch.

Squashed commit due to build breakage during code-reshuffle history.

Conflicts:
	xbmc/Util.cpp
	xbmc/cdrip/CDDARipper.cpp
	xbmc/filesystem/Directory.cpp
	xbmc/filesystem/File.cpp

1 files changed, 8 insertions, 0 deletions

diff --git a/lib/libdvd/libdvdnav/msvc/contrib/bcopy.c b/lib/libdvd/libdvdnav/msvc/contrib/bcopy.c
new file mode 100755
index 0000000000..21be364aef
--- /dev/null
+++ b/lib/libdvd/libdvdnav/msvc/contrib/bcopy.c
@@ -0,0 +1,8 @@
+#include <string.h>
+
+void bcopy(const void *IN, void *OUT, size_t N);
+
+void bcopy(const void *IN, void *OUT, size_t N)
+{
+  memcpy(OUT, IN, N);
+}