mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-25 03:00:46 +00:00
libxmp-lite: Changes to build (in C mode).
git-svn-id: https://svn.eduke32.com/eduke32@6160 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
44536c51d0
commit
35e8792efa
7 changed files with 11 additions and 8 deletions
|
@ -329,7 +329,7 @@ EXPORT void xmp_get_frame_info (xmp_context, struct xmp_frame_info *);
|
|||
EXPORT void xmp_end_player (xmp_context);
|
||||
EXPORT void xmp_inject_event (xmp_context, int, struct xmp_event *);
|
||||
EXPORT void xmp_get_module_info (xmp_context, struct xmp_module_info *);
|
||||
EXPORT char **xmp_get_format_list (void);
|
||||
EXPORT const char**xmp_get_format_list (void);
|
||||
EXPORT int xmp_next_position (xmp_context);
|
||||
EXPORT int xmp_prev_position (xmp_context);
|
||||
EXPORT int xmp_set_position (xmp_context, int);
|
||||
|
|
|
@ -145,7 +145,10 @@ void __inline CLIB_DECL D_(const char *text, ...) { do {} while (0); }
|
|||
#define close _close
|
||||
#define unlink _unlink
|
||||
#endif
|
||||
#if defined(_WIN32) || defined(__WATCOMC__) /* in win32.c */
|
||||
#if defined(_MSC_VER)
|
||||
#define snprintf _snprintf
|
||||
#define vsnprintf _vsnprintf
|
||||
#elif defined(__WATCOMC__) /* in win32.c */
|
||||
int libxmp_vsnprintf(char *, size_t, const char *, va_list);
|
||||
int libxmp_snprintf (char *, size_t, const char *, ...);
|
||||
#define snprintf libxmp_snprintf
|
||||
|
|
|
@ -495,7 +495,7 @@ int xmp_get_player__(xmp_context opaque, int parm)
|
|||
return ret;
|
||||
}
|
||||
|
||||
char **xmp_get_format_list()
|
||||
const char **xmp_get_format_list()
|
||||
{
|
||||
return format_list();
|
||||
}
|
||||
|
|
|
@ -46,7 +46,7 @@ const struct format_loader *const format_loader[5] = {
|
|||
|
||||
static const char *_farray[5] = { NULL };
|
||||
|
||||
char **format_list()
|
||||
const char **format_list()
|
||||
{
|
||||
int count, i;
|
||||
|
||||
|
@ -58,5 +58,5 @@ char **format_list()
|
|||
_farray[count] = NULL;
|
||||
}
|
||||
|
||||
return (char **)_farray;
|
||||
return _farray;
|
||||
}
|
||||
|
|
|
@ -11,7 +11,7 @@ struct format_loader {
|
|||
int (*const loader)(struct module_data *, HIO_HANDLE *, const int);
|
||||
};
|
||||
|
||||
char **format_list(void);
|
||||
const char **format_list(void);
|
||||
|
||||
#ifndef LIBXMP_CORE_PLAYER
|
||||
|
||||
|
|
|
@ -25,7 +25,7 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include "common.h"
|
||||
#include "loaders/loader.h"
|
||||
#include "loader.h"
|
||||
|
||||
|
||||
#ifndef LIBXMP_CORE_PLAYER
|
||||
|
|
|
@ -42,7 +42,7 @@ static inline ptrdiff_t CAN_READ(MFILE *m)
|
|||
int mgetc(MFILE *m)
|
||||
{
|
||||
if (CAN_READ(m) >= 1)
|
||||
return *(uint8 *)(m->start + m->pos++);
|
||||
return *(const uint8 *)(m->start + m->pos++);
|
||||
else
|
||||
return EOF;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue