fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-10 09:41:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

oslibs, codecs (macosx, windows): update mikmod.h from mainstream.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@937 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer 2014-07-20 08:21:01 +00:00
parent c53f7f65d4
commit f9dd406597
2 changed files with 90 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
MacOSX/codecs/include/mikmod.h
View file

@ -84,7 +84,7 @@ extern "C" {
MIKMODAPI extern long MikMod_GetVersion(void); MIKMODAPI extern long MikMod_GetVersion(void);
/* /*
* ========== Platform independent-type definitions * ========== Dependency platform headers
*/ */
#ifdef _WIN32 #ifdef _WIN32
@ -94,39 +94,65 @@ MIKMODAPI extern long MikMod_GetVersion(void);
#include <windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#include <mmsystem.h> #include <mmsystem.h>
#define _MIKMOD_WIN32
#endif
#if defined(__DJGPP__) || defined(MSDOS) || defined(__MSDOS__) || defined(__DOS__)
#define _MIKMOD_DOS
#endif #endif
#if defined(__OS2__) || defined(__EMX__) #if defined(__OS2__) || defined(__EMX__)
#define INCL_DOSSEMAPHORES #define INCL_DOSSEMAPHORES
#include <os2.h> #include <os2.h>
#include <io.h> #include <io.h>
#define _MIKMOD_OS2
#endif #endif
#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) #if defined(__MORPHOS__) || defined(__AROS__) || defined(AMIGA) || defined(__amigaos__) || defined(AMIGAOS)
typedef int BOOL; /* 0=false, <>0 true */ #include <exec/types.h>
#define _MIKMOD_AMIGA
#endif
/*
* ========== Platform independent-type definitions
* (pain when it comes to cross-platform maintenance..)
*/
#if !(defined(_MIKMOD_OS2) || defined(_MIKMOD_WIN32))
typedef char CHAR; typedef char CHAR;
#endif #endif
/* BOOL: 0=false, <>0 true -- 16 bits on Amiga, int-wide on others. */
#if !(defined(_MIKMOD_OS2) || defined(_MIKMOD_WIN32) || defined(_MIKMOD_AMIGA))
typedef int BOOL;
#endif
/* 1 byte, signed and unsigned: */ /* 1 byte, signed and unsigned: */
typedef signed char SBYTE; typedef signed char SBYTE;
#ifndef _MIKMOD_AMIGA
typedef unsigned char UBYTE; typedef unsigned char UBYTE;
#endif
/* 2 bytes, signed and unsigned: */ /* 2 bytes, signed and unsigned: */
typedef signed short SWORD; #ifndef __LCC__
typedef unsigned short UWORD; typedef signed short int SWORD;
#endif
#if !(defined(__LCC__) || defined(_MIKMOD_AMIGA))
typedef unsigned short int UWORD;
#endif
/* 4 bytes, signed and unsigned: */ /* 4 bytes, signed and unsigned: */
#if defined(_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) #if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
/* 64 bit architectures: */ /* 64 bit architectures: */
typedef signed int SLONG; typedef signed int SLONG;
#ifndef _WIN32 #if !(defined(_WIN32) || defined(__AROS__))
typedef unsigned int ULONG; typedef unsigned int ULONG;
#endif #endif
#else /* 32 bit architectures: */ #else /* 32 bit architectures: */
typedef signed long SLONG; typedef signed long int SLONG;
#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) #if !(defined(_MIKMOD_OS2) || defined(_MIKMOD_WIN32) || defined(_MIKMOD_AMIGA))
typedef unsigned long ULONG; typedef unsigned long int ULONG;
#endif #endif
#endif #endif
@ -136,7 +162,9 @@ typedef int __mikmod_typetest [
(sizeof(SBYTE)==1) && (sizeof(UBYTE)==1) (sizeof(SBYTE)==1) && (sizeof(UBYTE)==1)
&& (sizeof(SWORD)==2) && (sizeof(UWORD)==2) && (sizeof(SWORD)==2) && (sizeof(UWORD)==2)
&& (sizeof(SLONG)==4) && (sizeof(ULONG)==4) && (sizeof(SLONG)==4) && (sizeof(ULONG)==4)
#ifndef _MIKMOD_AMIGA
&& (sizeof(BOOL) == sizeof(int)) && (sizeof(BOOL) == sizeof(int))
#endif
&& (sizeof(CHAR) == sizeof(char)) && (sizeof(CHAR) == sizeof(char))
) * 2 - 1 ]; ) * 2 - 1 ];

48
Windows/codecs/include/mikmod.h
View file

@ -84,7 +84,7 @@ extern "C" {
MIKMODAPI extern long MikMod_GetVersion(void); MIKMODAPI extern long MikMod_GetVersion(void);
/* /*
* ========== Platform independent-type definitions * ========== Dependency platform headers
*/ */
#ifdef _WIN32 #ifdef _WIN32
@ -94,39 +94,65 @@ MIKMODAPI extern long MikMod_GetVersion(void);
#include <windows.h> #include <windows.h>
#include <io.h> #include <io.h>
#include <mmsystem.h> #include <mmsystem.h>
#define _MIKMOD_WIN32
#endif
#if defined(__DJGPP__) || defined(MSDOS) || defined(__MSDOS__) || defined(__DOS__)
#define _MIKMOD_DOS
#endif #endif
#if defined(__OS2__) || defined(__EMX__) #if defined(__OS2__) || defined(__EMX__)
#define INCL_DOSSEMAPHORES #define INCL_DOSSEMAPHORES
#include <os2.h> #include <os2.h>
#include <io.h> #include <io.h>
#define _MIKMOD_OS2
#endif #endif
#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) #if defined(__MORPHOS__) || defined(__AROS__) || defined(AMIGA) || defined(__amigaos__) || defined(AMIGAOS)
typedef int BOOL; /* 0=false, <>0 true */ #include <exec/types.h>
#define _MIKMOD_AMIGA
#endif
/*
* ========== Platform independent-type definitions
* (pain when it comes to cross-platform maintenance..)
*/
#if !(defined(_MIKMOD_OS2) || defined(_MIKMOD_WIN32))
typedef char CHAR; typedef char CHAR;
#endif #endif
/* BOOL: 0=false, <>0 true -- 16 bits on Amiga, int-wide on others. */
#if !(defined(_MIKMOD_OS2) || defined(_MIKMOD_WIN32) || defined(_MIKMOD_AMIGA))
typedef int BOOL;
#endif
/* 1 byte, signed and unsigned: */ /* 1 byte, signed and unsigned: */
typedef signed char SBYTE; typedef signed char SBYTE;
#ifndef _MIKMOD_AMIGA
typedef unsigned char UBYTE; typedef unsigned char UBYTE;
#endif
/* 2 bytes, signed and unsigned: */ /* 2 bytes, signed and unsigned: */
typedef signed short SWORD; #ifndef __LCC__
typedef unsigned short UWORD; typedef signed short int SWORD;
#endif
#if !(defined(__LCC__) || defined(_MIKMOD_AMIGA))
typedef unsigned short int UWORD;
#endif
/* 4 bytes, signed and unsigned: */ /* 4 bytes, signed and unsigned: */
#if defined(_LP64) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__) #if defined(_LP64) || defined(__LP64__) || defined(__arch64__) || defined(__alpha) || defined(__x86_64) || defined(__powerpc64__)
/* 64 bit architectures: */ /* 64 bit architectures: */
typedef signed int SLONG; typedef signed int SLONG;
#ifndef _WIN32 #if !(defined(_WIN32) || defined(__AROS__))
typedef unsigned int ULONG; typedef unsigned int ULONG;
#endif #endif
#else /* 32 bit architectures: */ #else /* 32 bit architectures: */
typedef signed long SLONG; typedef signed long int SLONG;
#if !defined(__OS2__) && !defined(__EMX__) && !defined(_WIN32) #if !(defined(_MIKMOD_OS2) || defined(_MIKMOD_WIN32) || defined(_MIKMOD_AMIGA))
typedef unsigned long ULONG; typedef unsigned long int ULONG;
#endif #endif
#endif #endif
@ -136,7 +162,9 @@ typedef int __mikmod_typetest [
(sizeof(SBYTE)==1) && (sizeof(UBYTE)==1) (sizeof(SBYTE)==1) && (sizeof(UBYTE)==1)
&& (sizeof(SWORD)==2) && (sizeof(UWORD)==2) && (sizeof(SWORD)==2) && (sizeof(UWORD)==2)
&& (sizeof(SLONG)==4) && (sizeof(ULONG)==4) && (sizeof(SLONG)==4) && (sizeof(ULONG)==4)
#ifndef _MIKMOD_AMIGA
&& (sizeof(BOOL) == sizeof(int)) && (sizeof(BOOL) == sizeof(int))
#endif
&& (sizeof(CHAR) == sizeof(char)) && (sizeof(CHAR) == sizeof(char))
) * 2 - 1 ]; ) * 2 - 1 ];