diff options
| author | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-04-23 16:24:18 +0000 |
|---|---|---|
| committer | Michael Roitzsch <mroi@users.sourceforge.net> | 2003-04-23 16:24:18 +0000 |
| commit | 483bf72bb184a76990634051b6cb673c10eadcbf (patch) | |
| tree | 5f983476aa8f5ed6dd173a385c87b209d14beb1c | |
| parent | a68f00985f1ae81290abcdcd41bbdb5c58968bb6 (diff) | |
| download | xine-lib-483bf72bb184a76990634051b6cb673c10eadcbf.tar.gz xine-lib-483bf72bb184a76990634051b6cb673c10eadcbf.tar.bz2 | |
preserve win32 patches for later merges of new versions
CVS patchset: 4665
CVS date: 2003/04/23 16:24:18
| -rw-r--r-- | src/input/libdvdnav/diff_against_cvs.patch | 14 | ||||
| -rw-r--r-- | src/input/libdvdread/diff_against_cvs.patch | 24 | ||||
| -rw-r--r-- | src/liba52/diff_against_release.patch | 12 |
3 files changed, 49 insertions, 1 deletions
diff --git a/src/input/libdvdnav/diff_against_cvs.patch b/src/input/libdvdnav/diff_against_cvs.patch index a68b867e4..21fe87e6e 100644 --- a/src/input/libdvdnav/diff_against_cvs.patch +++ b/src/input/libdvdnav/diff_against_cvs.patch @@ -42,8 +42,20 @@ this = (dvdnav_t*)malloc(sizeof(dvdnav_t)); --- src/input/libdvdnav/dvdnav.h Thu Jul 25 17:26:00 2002 +++ src/input/libdvdnav/dvdnav.h Fri Aug 9 22:01:19 2002 -@@ -41,8 +41,8 @@ +@@ -34,8 +34,13 @@ + #endif + + #ifdef HAVE_DVDNAV ++#ifndef _MSC_VER + # include <dvdnav/dvdnav_events.h> # include <dvdnav/dvd_types.h> ++#else ++# include "dvdnav_events.h" ++# include "dvd_types.h" ++#endif /* _MSC_VER */ + #else + # include "dvdnav_events.h" + # include "dvd_types.h" #endif -#include <dvdread/dvd_reader.h> diff --git a/src/input/libdvdread/diff_against_cvs.patch b/src/input/libdvdread/diff_against_cvs.patch index 074d111f2..faed31254 100644 --- a/src/input/libdvdread/diff_against_cvs.patch +++ b/src/input/libdvdread/diff_against_cvs.patch @@ -754,3 +754,27 @@ #undef ATTRIBUTE_PACKED +--- bswap.h ++++ bswap.h +@@ -65,7 +65,7 @@ + * functionality! + */ + +-#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) ++#elif defined(__FreeBSD__) || defined(__sun) || defined(__bsdi__) || defined(_MSC_VER) + #define B2N_16(x) \ + x = ((((x) & 0xff00) >> 8) | \ + (((x) & 0x00ff) << 8)) +--- dvd_reader.h ++++ dvd_reader.h +@@ -21,6 +21,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#if defined(_MSC_VER) ++typedef long ssize_t; ++#endif /* _MSC_VER */ ++ + #include <sys/types.h> + + /** diff --git a/src/liba52/diff_against_release.patch b/src/liba52/diff_against_release.patch index 2e1ac44ce..881e248dd 100644 --- a/src/liba52/diff_against_release.patch +++ b/src/liba52/diff_against_release.patch @@ -54,3 +54,15 @@ + free (state->samples_base); free (state); } +--- src/liba52/bitstream.h ++++ src/liba52/bitstream.h +@@ -21,6 +21,10 @@ + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + ++#ifdef WIN32 ++#include <unistd.h> ++#endif ++ + /* (stolen from the kernel) */ + #ifdef WORDS_BIGENDIAN |