Merge branch 'dev41' into unicode

starg2 · Apr 5, 2021 · fb9d80d · fb9d80d
2 parents d0cdb06 + 2d4b8d6
commit fb9d80d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/timidity/mix.c b/timidity/mix.c
@@ -86,7 +86,7 @@ const int32 max_amp_value = MAX_AMP_VALUE;
 #endif // DATA_T_INT32
 
 
-void mix_mystery_signal(DATA_T *sp, DATA_T *lp, int v, int count);
+static inline void mix_mystery_signal(DATA_T *sp, DATA_T *lp, int v, int count);
 void mix_voice(DATA_T *, int, int32);
 
 #if 0 // dim voice buffer

diff --git a/timidity/sysdep.h b/timidity/sysdep.h
@@ -315,6 +315,13 @@ typedef long off_size_t;
 # define lseek _lseek
 typedef off_t off_size_t; /* off_t is 32-bit signed */
 # endif /* _MSC_VER >= 1400 */
+#elif defined(__MINGW32__)
+# include <io.h>
+# define fseeko _fseeki64
+# define ftello _ftelli64
+# define lseek _lseeki64
+typedef int64 off_size_t;
+# define HAVE_OFF_SIZE_T_64BIT 1
 #elif defined(_LARGEFILE_SOURCE) || \
  (defined(_FILE_OFFSET_BITS) && _FILE_OFFSET_BITS == 64) || \
  (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) || \