HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 07d71754 DT |
1 | This patch includes |
| 2 | ||
| 3 | * mingw-w64-headers/include/winnt.h: compile fixes for1 gcc-4.9.3 | |
| 4 | * mingw-w64-headers/crt/math.h: Likewise | |
| 5 | * mingw-w64-headers/crt/float.h (FLT_EPSILON,DBL_EPSILON,LDBL_EPSILON): Add | |
| 6 | symbols. | |
| 7 | * mingw-w64-headers/crt/stat.h (S_ISLNK,S_ISSOCK,S_ISUID,S_ISGID,S_ISLINK): | |
| 8 | Add symbols. | |
| 9 | (lstat): Add function. | |
| 10 | * mingw-w64-headers/crt/_mingw_stat64.h: Likewise | |
| 11 | * mingw-w64-headers/crt/stdlib.h (realpath): Add function. | |
| 12 | ||
| 13 | Needed for building with gcc-4.9.3 and using with cross-libtool-2.4.6. | |
| 14 | ||
| 15 | Upstream status: not yet presented upstream. | |
| 16 | ||
| 17 | diff --git a/mingw-w64-headers/crt/float.h b/mingw-w64-headers/crt/float.h | |
| 18 | index 5874f4e..bdf4ead 100644 | |
| 19 | --- a/mingw-w64-headers/crt/float.h | |
| 20 | +++ b/mingw-w64-headers/crt/float.h | |
| 21 | @@ -22,6 +22,15 @@ | |
| 22 | #if (__GNUC__ < 4) | |
| 23 | #error Corrupt install of gcc-s internal headers, or search order was changed. | |
| 24 | #else | |
| 25 | + | |
| 26 | + /* From gcc-4.9.3 float.h. */ | |
| 27 | + #undef FLT_EPSILON | |
| 28 | + #undef DBL_EPSILON | |
| 29 | + #undef LDBL_EPSILON | |
| 30 | + #define FLT_EPSILON __FLT_EPSILON__ | |
| 31 | + #define DBL_EPSILON __DBL_EPSILON__ | |
| 32 | + #define LDBL_EPSILON __LDBL_EPSILON__ | |
| 33 | + | |
| 34 | /* #include_next <float_ginclude.h> */ | |
| 35 | ||
| 36 | /* Number of decimal digits, q, such that any floating-point number with q | |
| 37 | diff --git a/mingw-w64-headers/crt/math.h b/mingw-w64-headers/crt/math.h | |
| 38 | index 1e970f4..99a332f 100644 | |
| 39 | --- a/mingw-w64-headers/crt/math.h | |
| 40 | +++ b/mingw-w64-headers/crt/math.h | |
| 41 | @@ -216,6 +216,7 @@ extern "C" { | |
| 42 | #endif | |
| 43 | } | |
| 44 | ||
| 45 | +#if 0 | |
| 46 | __CRT_INLINE long double __cdecl fabsl (long double x) | |
| 47 | { | |
| 48 | #ifdef __arm__ | |
| 49 | @@ -226,6 +227,7 @@ extern "C" { | |
| 50 | return res; | |
| 51 | #endif | |
| 52 | } | |
| 53 | +#endif | |
| 54 | ||
| 55 | __CRT_INLINE double __cdecl fabs (double x) | |
| 56 | { | |
| 57 | @@ -905,7 +907,7 @@ __mingw_choose_expr ( \ | |
| 58 | /* 7.12.7.3 */ | |
| 59 | extern double __cdecl hypot (double, double) __MINGW_ATTRIB_DEPRECATED_MSVC2005; /* in libmoldname.a */ | |
| 60 | extern float __cdecl hypotf (float x, float y); | |
| 61 | -#ifndef __CRT__NO_INLINE | |
| 62 | +#if 0 //ndef __CRT__NO_INLINE | |
| 63 | __CRT_INLINE float __cdecl hypotf (float x, float y) { return (float) hypot ((double)x, (double)y);} | |
| 64 | #endif | |
| 65 | extern long double __cdecl hypotl (long double, long double); |