diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2005-02-03 07:19:03 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2005-02-03 07:19:03 +0000 |
| commit | 89c1c59fb83bc1d4598543b1bcaee5b69776b421 (patch) | |
| tree | 8f8f88de29b540e4f21ed63a243c12288571fbef /src/libmusepack | |
| parent | 00f8f557ae278bb0aa4dee3cb664e154d32a7ba3 (diff) | |
| download | xine-lib-89c1c59fb83bc1d4598543b1bcaee5b69776b421.tar.gz xine-lib-89c1c59fb83bc1d4598543b1bcaee5b69776b421.tar.bz2 | |
**BUGFIX**
Fixed build on solaris:
- use libresolv in hstrerror check
- replace PRIiMAX and PRIXMAX by PRIdMAX and PRIxMAX
Removed timezone struct for MinGW from public os_types.h, update header comment.
Fixed build musepack library on some platforms using xine types.
Thanks to Niki W. Waibel for reporting and testing.
CVS patchset: 7378
CVS date: 2005/02/03 07:19:03
Diffstat (limited to 'src/libmusepack')
| -rw-r--r-- | src/libmusepack/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libmusepack/diff_against_svn.patch | 19 | ||||
| -rw-r--r-- | src/libmusepack/musepack/config_types.h | 2 |
3 files changed, 22 insertions, 1 deletions
diff --git a/src/libmusepack/Makefile.am b/src/libmusepack/Makefile.am index ab0a76366..dfbb33a43 100644 --- a/src/libmusepack/Makefile.am +++ b/src/libmusepack/Makefile.am @@ -2,6 +2,8 @@ include $(top_srcdir)/misc/Makefile.common SUBDIRS = musepack +EXTRA_DIST = diff_against_svn.patch + libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_mpc.la diff --git a/src/libmusepack/diff_against_svn.patch b/src/libmusepack/diff_against_svn.patch new file mode 100644 index 000000000..0375b89c1 --- /dev/null +++ b/src/libmusepack/diff_against_svn.patch @@ -0,0 +1,19 @@ +Use xine's inttypes. +The file config_types.h is generated from config_types.h.in in musepack SVN. + +Index: src/libmusepack/musepack/config_types.h +=================================================================== +RCS file: /home/valtri/CVS/xine-lib/src/libmusepack/musepack/config_types.h,v +retrieving revision 1.1.1.2 +diff -u -p -u -p -r1.1.1.2 config_types.h +--- src/libmusepack/musepack/config_types.h 3 Feb 2005 00:19:24 -0000 1.1.1.2 ++++ src/libmusepack/musepack/config_types.h 3 Feb 2005 00:21:06 -0000 +@@ -1,7 +1,7 @@ + #ifndef __CONFIG_TYPES_H__ + #define __CONFIG_TYPES_H__ + +-#include <stdint.h> ++#include "os_types.h" + + #ifdef WORDS_BIGENDIAN + #undef MPC_LITTLE_ENDIAN diff --git a/src/libmusepack/musepack/config_types.h b/src/libmusepack/musepack/config_types.h index 164e73ebc..f501f5a38 100644 --- a/src/libmusepack/musepack/config_types.h +++ b/src/libmusepack/musepack/config_types.h @@ -1,7 +1,7 @@ #ifndef __CONFIG_TYPES_H__ #define __CONFIG_TYPES_H__ -#include <stdint.h> +#include "os_types.h" #ifdef WORDS_BIGENDIAN #undef MPC_LITTLE_ENDIAN |