Skip to content

Commit 82a7446

Browse files
committed
snd_mpg123: move MPG123_NO_LARGENAME define to our windows mpg123.h
1 parent 2eab89c commit 82a7446

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

engine/h2shared/snd_mpg123.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
#include "snd_mp3.h"
2626
#include <errno.h>
2727

28-
#define MPG123_NO_LARGENAME
2928
#define MPG123_DEF_SSIZE_T /* we do define ssize_t in our stdinc.h */
3029
#include <mpg123.h>
3130

@@ -169,7 +168,7 @@ static qboolean S_MP3_CodecOpenStream (snd_stream_t *stream)
169168
mpg123_close(priv->handle);
170169
mpg123_delete(priv->handle);
171170
}
172-
Z_Free(stream->priv);
171+
Z_Free(priv);
173172
}
174173
return false;
175174
}

oslibs/windows/codecs/include/mpg123.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,10 @@
88
#ifndef MPG123_LIB_H
99
#define MPG123_LIB_H
1010

11+
/* This build of libmpg123 has no _FILE_OFFSET_BITS=64 support: */
12+
#define MPG123_NO_LARGENAME
13+
/* */
14+
1115
/** \file mpg123.h The header file for the libmpg123 MPEG Audio decoder */
1216

1317
/* A macro to check at compile time which set of API functions to expect.
@@ -39,6 +43,10 @@ typedef ptrdiff_t ssize_t;
3943
#include <stdlib.h>
4044
#include <sys/types.h>
4145

46+
/* This build of libmpg123 has no _FILE_OFFSET_BITS=64 support: */
47+
#define off_t long
48+
/* */
49+
4250
/* Simplified large file handling.
4351
I used to have a check here that prevents building for a library with conflicting large file setup
4452
(application that uses 32 bit offsets with library that uses 64 bits).

oslibs/windows/codecs/include/mpg123_config.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,5 @@ mpg123-1.22.4, configured using:
33
edited src/libmpg123/mpg123lib_intern.h and changed macros
44
NOQUIET, VERBOSE* and PVERB() to be 0, in order to disable
55
some debug messages from the library.
6+
7+
This build of libmpg123 has no _FILE_OFFSET_BITS=64 support!

0 commit comments

Comments
 (0)