Mercurial > mxe-octave
annotate src/native-gcc-1-float.patch @ 3865:4e204ea06bc8
qt.mk: only depend on fontconfig if $(USE_SYSTEM_FONTCONFIG) is set to "no"
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 26 Mar 2015 09:05:37 -0400 |
parents | 9caae5336e92 |
children |
rev | line source |
---|---|
2915 | 1 This file is part of MXE. |
2 See index.html for further information. | |
3 | |
4 This patch has been taken from: | |
5 http://gcc.gnu.org/ml/gcc-patches/2010-06/msg00387.html | |
3719
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
6 http://sourceforge.net/p/mingw/bugs/1809 |
2915 | 7 |
3719
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
8 diff --git a/gcc/ginclude/float.h b/gcc/ginclude/float.h |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
9 index a8e05bf..23fbb3d 100644 |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
10 --- a/gcc/ginclude/float.h |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
11 +++ b/gcc/ginclude/float.h |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
12 @@ -275,3 +275,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see |
2915 | 13 #endif /* __STDC_WANT_DEC_FP__ */ |
14 | |
15 #endif /* _FLOAT_H___ */ | |
16 + | |
17 +#ifdef __MINGW32__ | |
3719
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
18 + /* |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
19 + * the MinGW-supplied header, which is guarded by the |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
20 + * _MINGW_FLOAT_H_ macro, may be found first, thus... |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
21 + */ |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
22 +#ifndef _MINGW_FLOAT_H_ |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
23 + /* |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
24 + * ...when we didn't find the MinGW-supplied header first, we |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
25 + * want to pull it in now; include_next should achieve this |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
26 + */ |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
27 +# include_next <float.h> |
2915 | 28 +#endif |
3719
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
29 +#endif |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
30 -- |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
31 1.8.4.5 |
9caae5336e92
Undo botched commit. Backed out changeset 992be3109433
John W. Eaton <jwe@octave.org>
parents:
3718
diff
changeset
|
32 |