Mercurial > sdl-ios-xcode
view src/libm/math_private.h @ 4426:1bceff8f008f
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.)
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | 02aa80d7905f |
children | fd40b483d489 |
line wrap: on
line source
/* * ==================================================== * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. * * Developed at SunPro, a Sun Microsystems, Inc. business. * Permission to use, copy, modify, and distribute this * software is freely granted, provided that this notice * is preserved. * ==================================================== */ /* * from: @(#)fdlibm.h 5.1 93/09/24 * $Id: math_private.h,v 1.3 2004/02/09 07:10:38 andersen Exp $ */ #ifndef _MATH_PRIVATE_H_ #define _MATH_PRIVATE_H_ /*#include <endian.h>*/ #include <sys/types.h> #define attribute_hidden #define libm_hidden_proto(x) #define libm_hidden_def(x) typedef unsigned int u_int32_t; /* The original fdlibm code used statements like: n0 = ((*(int*)&one)>>29)^1; * index of high word * ix0 = *(n0+(int*)&x); * high word of x * ix1 = *((1-n0)+(int*)&x); * low word of x * to dig two 32 bit words out of the 64 bit IEEE floating point value. That is non-ANSI, and, moreover, the gcc instruction scheduler gets it wrong. We instead use the following macros. Unlike the original code, we determine the endianness at compile time, not at run time; I don't see much benefit to selecting endianness at run time. */ /* A union which permits us to convert between a double and two 32 bit ints. */ /* * Math on arm is special: * For FPA, float words are always big-endian. * For VFP, floats words follow the memory system mode. */ #if (__BYTE_ORDER == __BIG_ENDIAN) || \ (!defined(__VFP_FP__) && (defined(__arm__) || defined(__thumb__))) typedef union { double value; struct { u_int32_t msw; u_int32_t lsw; } parts; } ieee_double_shape_type; #else typedef union { double value; struct { u_int32_t lsw; u_int32_t msw; } parts; } ieee_double_shape_type; #endif /* Get two 32 bit ints from a double. */ #define EXTRACT_WORDS(ix0,ix1,d) \ do { \ ieee_double_shape_type ew_u; \ ew_u.value = (d); \ (ix0) = ew_u.parts.msw; \ (ix1) = ew_u.parts.lsw; \ } while (0) /* Get the more significant 32 bit int from a double. */ #define GET_HIGH_WORD(i,d) \ do { \ ieee_double_shape_type gh_u; \ gh_u.value = (d); \ (i) = gh_u.parts.msw; \ } while (0) /* Get the less significant 32 bit int from a double. */ #define GET_LOW_WORD(i,d) \ do { \ ieee_double_shape_type gl_u; \ gl_u.value = (d); \ (i) = gl_u.parts.lsw; \ } while (0) /* Set a double from two 32 bit ints. */ #define INSERT_WORDS(d,ix0,ix1) \ do { \ ieee_double_shape_type iw_u; \ iw_u.parts.msw = (ix0); \ iw_u.parts.lsw = (ix1); \ (d) = iw_u.value; \ } while (0) /* Set the more significant 32 bits of a double from an int. */ #define SET_HIGH_WORD(d,v) \ do { \ ieee_double_shape_type sh_u; \ sh_u.value = (d); \ sh_u.parts.msw = (v); \ (d) = sh_u.value; \ } while (0) /* Set the less significant 32 bits of a double from an int. */ #define SET_LOW_WORD(d,v) \ do { \ ieee_double_shape_type sl_u; \ sl_u.value = (d); \ sl_u.parts.lsw = (v); \ (d) = sl_u.value; \ } while (0) /* A union which permits us to convert between a float and a 32 bit int. */ typedef union { float value; u_int32_t word; } ieee_float_shape_type; /* Get a 32 bit int from a float. */ #define GET_FLOAT_WORD(i,d) \ do { \ ieee_float_shape_type gf_u; \ gf_u.value = (d); \ (i) = gf_u.word; \ } while (0) /* Set a float from a 32 bit int. */ #define SET_FLOAT_WORD(d,i) \ do { \ ieee_float_shape_type sf_u; \ sf_u.word = (i); \ (d) = sf_u.value; \ } while (0) /* ieee style elementary functions */ extern double __ieee754_sqrt(double) attribute_hidden; extern double __ieee754_acos(double) attribute_hidden; extern double __ieee754_acosh(double) attribute_hidden; extern double __ieee754_log(double) attribute_hidden; extern double __ieee754_atanh(double) attribute_hidden; extern double __ieee754_asin(double) attribute_hidden; extern double __ieee754_atan2(double, double) attribute_hidden; extern double __ieee754_exp(double) attribute_hidden; extern double __ieee754_cosh(double) attribute_hidden; extern double __ieee754_fmod(double, double) attribute_hidden; extern double __ieee754_pow(double, double) attribute_hidden; extern double __ieee754_lgamma_r(double, int *) attribute_hidden; extern double __ieee754_gamma_r(double, int *) attribute_hidden; extern double __ieee754_lgamma(double) attribute_hidden; extern double __ieee754_gamma(double) attribute_hidden; extern double __ieee754_log10(double) attribute_hidden; extern double __ieee754_sinh(double) attribute_hidden; extern double __ieee754_hypot(double, double) attribute_hidden; extern double __ieee754_j0(double) attribute_hidden; extern double __ieee754_j1(double) attribute_hidden; extern double __ieee754_y0(double) attribute_hidden; extern double __ieee754_y1(double) attribute_hidden; extern double __ieee754_jn(int, double) attribute_hidden; extern double __ieee754_yn(int, double) attribute_hidden; extern double __ieee754_remainder(double, double) attribute_hidden; extern int __ieee754_rem_pio2(double, double *) attribute_hidden; #if defined(_SCALB_INT) extern double __ieee754_scalb(double, int) attribute_hidden; #else extern double __ieee754_scalb(double, double) attribute_hidden; #endif /* fdlibm kernel function */ #ifndef _IEEE_LIBM extern double __kernel_standard(double, double, int) attribute_hidden; #endif extern double __kernel_sin(double, double, int) attribute_hidden; extern double __kernel_cos(double, double) attribute_hidden; extern double __kernel_tan(double, double, int) attribute_hidden; extern int __kernel_rem_pio2(double *, double *, int, int, int, const int *) attribute_hidden; #endif /* _MATH_PRIVATE_H_ */