zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-13 11:30:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

libxmp-lite: Changes to build (in C mode).

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6160 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
hendricks266 2017-06-09 06:39:48 +00:00
parent 44536c51d0
commit 35e8792efa
7 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/libxmp-lite/include/libxmp-lite/xmp.h
View file

@ -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_end_player (xmp_context);
EXPORT void xmp_inject_event (xmp_context, int, struct xmp_event *); EXPORT void xmp_inject_event (xmp_context, int, struct xmp_event *);
EXPORT void xmp_get_module_info (xmp_context, struct xmp_module_info *); 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_next_position (xmp_context);
EXPORT int xmp_prev_position (xmp_context); EXPORT int xmp_prev_position (xmp_context);
EXPORT int xmp_set_position (xmp_context, int); EXPORT int xmp_set_position (xmp_context, int);

5
source/libxmp-lite/src/common.h
View file

@ -145,7 +145,10 @@ void __inline CLIB_DECL D_(const char *text, ...) { do {} while (0); }
#define close _close #define close _close
#define unlink _unlink #define unlink _unlink
#endif #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_vsnprintf(char *, size_t, const char *, va_list);
int libxmp_snprintf (char *, size_t, const char *, ...); int libxmp_snprintf (char *, size_t, const char *, ...);
#define snprintf libxmp_snprintf #define snprintf libxmp_snprintf

2
source/libxmp-lite/src/control.c
View file

@ -495,7 +495,7 @@ int xmp_get_player__(xmp_context opaque, int parm)
return ret; return ret;
} }
char **xmp_get_format_list() const char **xmp_get_format_list()
{ {
return format_list(); return format_list();
} }

4
source/libxmp-lite/src/format.c
View file

@ -46,7 +46,7 @@ const struct format_loader *const format_loader[5] = {
static const char *_farray[5] = { NULL }; static const char *_farray[5] = { NULL };
char **format_list() const char **format_list()
{ {
int count, i; int count, i;
@ -58,5 +58,5 @@ char **format_list()
_farray[count] = NULL; _farray[count] = NULL;
} }
return (char **)_farray; return _farray;
} }

2
source/libxmp-lite/src/format.h
View file

@ -11,7 +11,7 @@ struct format_loader {
int (*const loader)(struct module_data *, HIO_HANDLE *, const int); int (*const loader)(struct module_data *, HIO_HANDLE *, const int);
}; };
char **format_list(void); const char **format_list(void);
#ifndef LIBXMP_CORE_PLAYER #ifndef LIBXMP_CORE_PLAYER

2
source/libxmp-lite/src/load_helpers.c
View file

@ -25,7 +25,7 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include "common.h" #include "common.h"
#include "loaders/loader.h" #include "loader.h"
#ifndef LIBXMP_CORE_PLAYER #ifndef LIBXMP_CORE_PLAYER

2
source/libxmp-lite/src/memio.c
View file

@ -42,7 +42,7 @@ static inline ptrdiff_t CAN_READ(MFILE *m)
int mgetc(MFILE *m) int mgetc(MFILE *m)
{ {
if (CAN_READ(m) >= 1) if (CAN_READ(m) >= 1)
return *(uint8 *)(m->start + m->pos++); return *(const uint8 *)(m->start + m->pos++);
else else
return EOF; return EOF;
} }