mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-24 22:53:42 +00:00
e71cd2ed38
Backport patches to fix incompatible pointer conversion errors.
27 lines
1.9 KiB
Diff
27 lines
1.9 KiB
Diff
--- a/music_mpg123.c 2018-10-31 10:59:00.000000000 -0400
|
|
+++ b/music_mpg123.c 2023-09-05 21:31:51.529191521 -0400
|
|
@@ -48,7 +48,11 @@
|
|
int (*mpg123_open_handle)(mpg123_handle *mh, void *iohandle);
|
|
const char* (*mpg123_plain_strerror)(int errcode);
|
|
void (*mpg123_rates)(const long **list, size_t *number);
|
|
+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */
|
|
+ int (*mpg123_read)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done );
|
|
+#else
|
|
int (*mpg123_read)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done );
|
|
+#endif
|
|
int (*mpg123_replace_reader_handle)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) );
|
|
off_t (*mpg123_seek)( mpg123_handle *mh, off_t sampleoff, int whence );
|
|
const char* (*mpg123_strerror)(mpg123_handle *mh);
|
|
@@ -95,7 +99,11 @@
|
|
FUNCTION_LOADER(mpg123_open_handle, int (*)(mpg123_handle *mh, void *iohandle))
|
|
FUNCTION_LOADER(mpg123_plain_strerror, const char* (*)(int errcode))
|
|
FUNCTION_LOADER(mpg123_rates, void (*)(const long **list, size_t *number));
|
|
+#if (MPG123_API_VERSION >= 45) /* api (but not abi) change as of mpg123-1.26.0 */
|
|
+ FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, void *outmemory, size_t outmemsize, size_t *done ))
|
|
+#else
|
|
FUNCTION_LOADER(mpg123_read, int (*)(mpg123_handle *mh, unsigned char *outmemory, size_t outmemsize, size_t *done ))
|
|
+#endif
|
|
FUNCTION_LOADER(mpg123_replace_reader_handle, int (*)( mpg123_handle *mh, ssize_t (*r_read) (void *, void *, size_t), off_t (*r_lseek)(void *, off_t, int), void (*cleanup)(void*) ))
|
|
FUNCTION_LOADER(mpg123_seek, off_t (*)( mpg123_handle *mh, off_t sampleoff, int whence ))
|
|
FUNCTION_LOADER(mpg123_strerror, const char* (*)(mpg123_handle *mh))
|