5bafa16e7f
Starting in gcc 4.7 "Windows mingw targets are using the -mms-bitfields option by default." <http://gcc.gnu.org/gcc-4.7/changes.html>. This causes __attribute__((packed)) not to be effective on structures that are used to express the layout of on-disk data. In turn, that causes piggy.c to mishandle texture loads, eventually resulting in an infinite loop. Add a pragma pack to force the headers to pack tightly on Windows.
107 lines
2.2 KiB
C
107 lines
2.2 KiB
C
/*
|
|
*
|
|
* Common types and defines
|
|
*
|
|
*/
|
|
|
|
#ifndef _TYPES_H
|
|
#define _TYPES_H
|
|
|
|
#ifndef macintosh
|
|
#include <sys/types.h>
|
|
#endif
|
|
|
|
#include <limits.h>
|
|
|
|
// define a dboolean
|
|
typedef int dboolean;
|
|
|
|
//define a signed byte
|
|
typedef signed char sbyte;
|
|
|
|
//define unsigned types;
|
|
typedef unsigned char ubyte;
|
|
#if defined(_WIN32) || defined(macintosh)
|
|
typedef unsigned short ushort;
|
|
typedef unsigned int uint;
|
|
#endif
|
|
|
|
#if defined(_WIN32) || defined(__sun__) // platforms missing (u_)int??_t
|
|
# include <SDL_types.h>
|
|
#elif defined(macintosh) // misses (u_)int??_t and does not like SDL_types.h
|
|
# include <MacTypes.h>
|
|
typedef SInt16 int16_t;
|
|
typedef SInt32 int32_t;
|
|
typedef SInt64 int64_t;
|
|
typedef UInt16 u_int16_t;
|
|
typedef UInt32 u_int32_t;
|
|
typedef UInt64 u_int64_t;
|
|
#endif // macintosh
|
|
#if defined(_WIN32) || defined(__sun__) // platforms missing u_int??_t
|
|
typedef Uint16 u_int16_t;
|
|
typedef Uint32 u_int32_t;
|
|
typedef Uint64 u_int64_t;
|
|
#endif // defined(_WIN32) || defined(__sun__)
|
|
|
|
#ifdef _MSC_VER
|
|
# include <stdlib.h> // this is where min and max are defined
|
|
#endif
|
|
#ifndef __cplusplus
|
|
#ifndef min
|
|
#define min(a,b) (((a)>(b))?(b):(a))
|
|
#endif
|
|
#ifndef max
|
|
#define max(a,b) (((a)<(b))?(b):(a))
|
|
#endif
|
|
|
|
#ifndef PATH_MAX
|
|
#define PATH_MAX 4096
|
|
#endif
|
|
|
|
#ifndef bool
|
|
//define a boolean
|
|
typedef ubyte bool;
|
|
#endif
|
|
|
|
#ifndef NULL
|
|
#define NULL 0
|
|
#endif
|
|
#endif
|
|
|
|
// the following stuff has nothing to do with types but needed everywhere,
|
|
// and since this file is included everywhere, it's here.
|
|
#if defined(__i386__) || defined(__ia64__) || defined(_WIN32) || \
|
|
(defined(__alpha__) || defined(__alpha)) || \
|
|
defined(__arm__) || defined(ARM) || \
|
|
(defined(__mips__) && defined(__MIPSEL__)) || \
|
|
defined(__SYMBIAN32__) || \
|
|
defined(__x86_64__) || \
|
|
defined(__LITTLE_ENDIAN__) // from physfs_internal.h
|
|
//# define WORDS_BIGENDIAN 0
|
|
#else
|
|
# define WORDS_BIGENDIAN 1
|
|
#endif
|
|
|
|
#ifdef __GNUC__
|
|
# define __pack__ __attribute__((packed))
|
|
#ifdef WIN32
|
|
# pragma pack(1)
|
|
#endif
|
|
#elif defined(_MSC_VER)
|
|
# pragma pack(push, packing)
|
|
# pragma pack(1)
|
|
# define __pack__
|
|
#elif defined(macintosh)
|
|
# pragma options align=packed
|
|
# define __pack__
|
|
#else
|
|
# error "This program will not work without packed structures"
|
|
#endif
|
|
|
|
#ifdef _MSC_VER
|
|
# define inline __inline
|
|
#endif
|
|
|
|
#endif //_TYPES_H
|
|
|