Merge remote-tracking branch 'mpg123/master' into master-with-github-ci

madebr · Oct 1, 2023 · 74846da · 74846da
2 parents f7621dd + cad2243
commit 74846da
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -2,6 +2,9 @@
 ------
 - ports/cmake: Only enable modules with GetThreadErrorMode() on Windows.
 - compat: Define EOVERFLOW for ancient Windows toolchains.
+- libmpg123, libsyn123: always ifdef LFS_LARGEFILE_64 (not just if)
+- libsyn123: re-introduce _32 wrappers in addition to suffix-less ones
+  (regression from 1.31, bug 363)
 
 1.32.2
 ------

diff --git a/src/libmpg123/lfs_wrap.c b/src/libmpg123/lfs_wrap.c
@@ -91,7 +91,7 @@ struct wrap_data
 	off_t (*r_lseek)(int, off_t, int);
 	mpg123_ssize_t (*r_h_read)(void *, void *, size_t);
 	off_t (*r_h_lseek)(void*, off_t, int);
-#if LFS_LARGEFILE_64
+#ifdef LFS_LARGEFILE_64
 	mpg123_ssize_t (*r_read_64) (int, void *, size_t);
 	off64_t (*r_lseek_64)(int, off64_t, int);
 	mpg123_ssize_t (*r_h_read_64)(void *, void *, size_t);
@@ -176,7 +176,7 @@ static struct wrap_data* wrap_get(mpg123_handle *mh, int force_alloc)
 		whd->r_lseek = NULL;
 		whd->r_h_read = NULL;
 		whd->r_h_lseek = NULL;
-#if LFS_LARGEFILE_64
+#ifdef LFS_LARGEFILE_64
 		whd->r_read_64 = NULL;
 		whd->r_lseek_64 = NULL;
 		whd->r_h_read_64 = NULL;

diff --git a/src/libsyn123/resample.c b/src/libsyn123/resample.c
@@ -2040,15 +2040,19 @@ type attribute_align_arg name(long inrate, long outrate, type io) \
 #if  SIZEOF_OFF_T == 8
 resample_total_alias(off_t, syn123_resample_total, syn123_resample_total64)
 resample_total_alias(off_t, syn123_resample_intotal, syn123_resample_intotal64)
+resample_total_alias(off_t, syn123_resample_total_64, syn123_resample_total64)
+resample_total_alias(off_t, syn123_resample_intotal_64, syn123_resample_intotal64)
 #elif SIZEOF_OFF_T == 4
 resample_total_wrap(off_t, INT32_MAX, syn123_resample_total, syn123_resample_total64)
 resample_total_wrap(off_t, INT32_MAX, syn123_resample_intotal, syn123_resample_intotal64)
-#if LFS_LARGEFILE_64
+resample_total_wrap(off_t, INT32_MAX, syn123_resample_total_32, syn123_resample_total64)
+resample_total_wrap(off_t, INT32_MAX, syn123_resample_intotal_32, syn123_resample_intotal64)
+#ifdef LFS_LARGEFILE_64
 resample_total_alias(off64_t, syn123_resample_total_64, syn123_resample_total64)
 resample_total_alias(off64_t, syn123_resample_intotal_64, syn123_resample_intotal64)
 #endif
 #else
-#error "Unexpected LFS_ALIAS_BITS value."
+#error "Unexpected off_t size."
 #endif
 
 #endif