Mercurial > audlegacy-plugins
changeset 330:74df3bd6f472 trunk
[svn] - portability fixes:
+ use old inttypes.h if stdint.h is not available
+ use NULL instead of 0 when dealing with pointers
| author | nenolod |
|---|---|
| date | Mon, 04 Dec 2006 13:50:33 -0800 |
| parents | c457e253275a |
| children | 5c4a9e4ba3be |
| files | ChangeLog src/aac/mp4ff/mp4ff_int_types.h src/alac/alac.c src/alac/demux.c src/alac/demux.h src/alac/plugin.c src/alac/stream.c src/alac/stream.h src/sexypsf/xmms.c |
| diffstat | 9 files changed, 94 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 04 13:18:25 2006 -0800 +++ b/ChangeLog Mon Dec 04 13:50:33 2006 -0800 @@ -1,3 +1,11 @@ +2006-12-04 21:18:25 +0000 William Pitcock <nenolod@nenolod.net> + revision [722] + - remove xentry.h reference + + trunk/src/mpg123/fileinfo.c | 2 -- + 1 file changed, 2 deletions(-) + + 2006-12-04 09:07:59 +0000 Daniel Bradshaw <nazca@atheme.org> revision [720] Well I think it's pretty
--- a/src/aac/mp4ff/mp4ff_int_types.h Mon Dec 04 13:18:25 2006 -0800 +++ b/src/aac/mp4ff/mp4ff_int_types.h Mon Dec 04 13:50:33 2006 -0800 @@ -1,3 +1,5 @@ +#include "../../../config.h" + #ifndef _MP4FF_INT_TYPES_H_ #define _MP4FF_INT_TYPES_H_ @@ -15,7 +17,13 @@ #else -#include <stdint.h> +#if HAVE_STDINT_H +# include <stdint.h> +#else +# if HAVE_INTTYPES_H +# include <inttypes.h> +# endif +#endif #endif
--- a/src/alac/alac.c Mon Dec 04 13:18:25 2006 -0800 +++ b/src/alac/alac.c Mon Dec 04 13:50:33 2006 -0800 @@ -29,11 +29,19 @@ * */ +#include "config.h" #include <stdio.h> #include <stdlib.h> #include <string.h> -#include <stdint.h> + +#if HAVE_STDINT_H +# include <stdint.h> +#else +# if HAVE_INTTYPES_H +# include <inttypes.h> +# endif +#endif #include "decomp.h"
--- a/src/alac/demux.c Mon Dec 04 13:18:25 2006 -0800 +++ b/src/alac/demux.c Mon Dec 04 13:50:33 2006 -0800 @@ -29,10 +29,19 @@ * */ +#include "config.h" #include <string.h> #include <stdio.h> -#include <stdint.h> + +#if HAVE_STDINT_H +# include <stdint.h> +#else +# if HAVE_INTTYPES_H +# include <inttypes.h> +# endif +#endif + #include <stdlib.h> #include <glib.h>
--- a/src/alac/demux.h Mon Dec 04 13:18:25 2006 -0800 +++ b/src/alac/demux.h Mon Dec 04 13:50:33 2006 -0800 @@ -1,7 +1,16 @@ #ifndef DEMUX_H #define DEMUX_H -#include <stdint.h> +#include "config.h" + +#if HAVE_STDINT_H +# include <stdint.h> +#else +# if HAVE_INTTYPES_H +# include <inttypes.h> +# endif +#endif + #include "decomp.h" #include "stream.h"
--- a/src/alac/plugin.c Mon Dec 04 13:18:25 2006 -0800 +++ b/src/alac/plugin.c Mon Dec 04 13:50:33 2006 -0800 @@ -25,9 +25,19 @@ * OTHER DEALINGS IN THE SOFTWARE. */ +#include "config.h" + #include <ctype.h> #include <stdio.h> -#include <stdint.h> + +#if HAVE_STDINT_H +# include <stdint.h> +#else +# if HAVE_INTTYPES_H +# include <inttypes.h> +# endif +#endif + #include <stdlib.h> #include <errno.h> #include <string.h>
--- a/src/alac/stream.c Mon Dec 04 13:18:25 2006 -0800 +++ b/src/alac/stream.c Mon Dec 04 13:50:33 2006 -0800 @@ -29,9 +29,18 @@ * */ +#include "config.h" #include <stdio.h> -#include <stdint.h> + +#if HAVE_STDINT_H +# include <stdint.h> +#else +# if HAVE_INTTYPES_H +# include <inttypes.h> +# endif +#endif + #include <stdlib.h> #include <errno.h>
--- a/src/alac/stream.h Mon Dec 04 13:18:25 2006 -0800 +++ b/src/alac/stream.h Mon Dec 04 13:50:33 2006 -0800 @@ -3,7 +3,15 @@ /* stream.h */ -#include <stdint.h> +#include "config.h" + +#if HAVE_STDINT_H +# include <stdint.h> +#else +# if HAVE_INTTYPES_H +# include <inttypes.h> +# endif +#endif #include <audacious/plugin.h> #include <audacious/vfs.h>
--- a/src/sexypsf/xmms.c Mon Dec 04 13:18:25 2006 -0800 +++ b/src/sexypsf/xmms.c Mon Dec 04 13:50:33 2006 -0800 @@ -279,32 +279,32 @@ InputPlugin sexypsf_ip = { - 0, - 0, + NULL, + NULL, "Plays PSF1 files.", - 0, - 0, - 0, + NULL, + NULL, + NULL, is_our_file, - 0, + NULL, sexypsf_xmms_play, sexypsf_xmms_stop, sexypsf_xmms_pause, sexypsf_xmms_seek, - 0, + NULL, sexypsf_xmms_gettime, - 0, - 0, - 0, - 0, - 0, - 0, - 0, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, sexypsf_xmms_getsonginfo, - 0, - 0, + NULL, + NULL, get_tuple_psf, - 0, - 0, + NULL, + NULL, is_our_fd, };