File tree 4 files changed +16
-3
lines changed
4 files changed +16
-3
lines changed Original file line number Diff line number Diff line change @@ -452,6 +452,7 @@ AC_SUBST(DEBUG_QGIS)
452
452
AC_CONFIG_FILES([
453
453
Makefile
454
454
Makefile.win.rules
455
+ create_qm_files.sh
455
456
doc/Makefile
456
457
doc/images/Makefile
457
458
doc/install_guide/Makefile
Original file line number Diff line number Diff line change 9
9
# create_qm_files.sh,v 1.4 2004/07/14 18:16:00 gsherman Exp
10
10
echo Creating qmake project file
11
11
# force the output name to be qgis_qm.pro
12
- qmake -project -o qgis_qm.pro
12
+ @QTDIR@/bin/ qmake -project -o qgis_qm.pro
13
13
echo Creating qm files
14
- lrelease -verbose qgis_qm.pro
14
+ @QTDIR@/bin/ lrelease -verbose qgis_qm.pro
15
15
echo Removing qmake project file
16
16
rm qgis_qm.pro
Original file line number Diff line number Diff line change @@ -40,8 +40,12 @@ extern "C" {
40
40
#ifdef Q_OS_MACX
41
41
#include < util.h>
42
42
#else
43
+ #ifdef __NetBSD__
44
+ #include < util.h>
45
+ #else
43
46
#include < pty.h>
44
47
#endif
48
+ #endif
45
49
#include < sys/types.h>
46
50
#include < sys/stat.h>
47
51
#include < sys/ioctl.h>
Original file line number Diff line number Diff line change 18
18
19
19
/* $Id$ */
20
20
21
+ #define _GLIBCPP_USE_C99 1
22
+ #include < cmath>
23
+ #undef _GLIBCPP_USE_C99
24
+
21
25
#include " qgslogger.h"
22
26
#include " qgswmsprovider.h"
23
27
29
33
30
34
#include " qgshttptransaction.h"
31
35
32
- #include < cmath>
33
36
#include < q3url.h>
34
37
#include < Q3Picture>
35
38
@@ -1948,8 +1951,13 @@ bool QgsWmsProvider::calculateExtent()
1948
1951
}
1949
1952
1950
1953
// make sure extent does not contain 'inf' or 'nan'
1954
+ #if __GNUC__ >= 4
1955
+ if (!isfinite (extent.xMin ()) || !isfinite ((int )extent.yMin ()) || !isfinite (extent.xMax ()) || \
1956
+ !isfinite ((int )extent.yMax ()))
1957
+ #else
1951
1958
if (!std::isfinite (extent.xMin ()) || !std::isfinite ((int )extent.yMin ()) || !std::isfinite (extent.xMax ()) || \
1952
1959
!std::isfinite ((int )extent.yMax ()))
1960
+ #endif
1953
1961
{
1954
1962
continue ;
1955
1963
}
You can’t perform that action at this time.
0 commit comments