aboutsummaryrefslogtreecommitdiff
path: root/src/projections
diff options
context:
space:
mode:
authorCharles Karney <charles@karney.com>2019-09-19 08:30:21 -0400
committerGitHub <noreply@github.com>2019-09-19 08:30:21 -0400
commit8948068deaa8b1b9cf14e7e509d06abc3a0b8dcf (patch)
treed27e655be51c44ef5d2c26dee0cc22547a36b029 /src/projections
parent72203ca68e123a237c8c748d39131b702ea4b646 (diff)
parent21c6d9cccde9318dd38c60b8bc559508bcee1a91 (diff)
downloadPROJ-8948068deaa8b1b9cf14e7e509d06abc3a0b8dcf.tar.gz
PROJ-8948068deaa8b1b9cf14e7e509d06abc3a0b8dcf.zip
Merge pull request #1618 from cffk/c99-math-update
Remove unneeded C99 compatibility functions from math.cpp and proj_math.h I'll do the clean up of the -std=c89 flags etc. as a separate pull request.
Diffstat (limited to 'src/projections')
-rw-r--r--src/projections/aea.cpp2
-rw-r--r--src/projections/aeqd.cpp2
-rw-r--r--src/projections/bipc.cpp2
-rw-r--r--src/projections/bonne.cpp2
-rw-r--r--src/projections/ccon.cpp2
-rw-r--r--src/projections/eqdc.cpp2
-rw-r--r--src/projections/geos.cpp2
-rw-r--r--src/projections/gnom.cpp2
-rw-r--r--src/projections/isea.cpp2
-rw-r--r--src/projections/laea.cpp2
-rw-r--r--src/projections/lcc.cpp2
-rw-r--r--src/projections/merc.cpp2
-rw-r--r--src/projections/mod_ster.cpp2
-rw-r--r--src/projections/nsper.cpp2
-rw-r--r--src/projections/oea.cpp2
-rw-r--r--src/projections/ortho.cpp2
-rw-r--r--src/projections/robin.cpp2
-rw-r--r--src/projections/sconics.cpp2
-rw-r--r--src/projections/stere.cpp2
-rw-r--r--src/projections/sterea.cpp2
-rw-r--r--src/projections/tmerc.cpp2
-rw-r--r--src/projections/tobmerc.cpp2
-rw-r--r--src/projections/tpeqd.cpp2
23 files changed, 23 insertions, 23 deletions
diff --git a/src/projections/aea.cpp b/src/projections/aea.cpp
index d607c95a..7b5c0fb5 100644
--- a/src/projections/aea.cpp
+++ b/src/projections/aea.cpp
@@ -31,7 +31,7 @@
#include "proj.h"
#include <errno.h>
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
# define EPS10 1.e-10
diff --git a/src/projections/aeqd.cpp b/src/projections/aeqd.cpp
index 04c3662e..a187edb7 100644
--- a/src/projections/aeqd.cpp
+++ b/src/projections/aeqd.cpp
@@ -30,7 +30,7 @@
#include "proj.h"
#include <errno.h>
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
namespace { // anonymous namespace
enum Mode {
diff --git a/src/projections/bipc.cpp b/src/projections/bipc.cpp
index 9fd2fc6f..9e991ecc 100644
--- a/src/projections/bipc.cpp
+++ b/src/projections/bipc.cpp
@@ -4,7 +4,7 @@
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(bipc, "Bipolar conic of western hemisphere") "\n\tConic Sph";
diff --git a/src/projections/bonne.cpp b/src/projections/bonne.cpp
index 31f90907..89f69e6d 100644
--- a/src/projections/bonne.cpp
+++ b/src/projections/bonne.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(bonne, "Bonne (Werner lat_1=90)")
diff --git a/src/projections/ccon.cpp b/src/projections/ccon.cpp
index e2312c0d..df995f21 100644
--- a/src/projections/ccon.cpp
+++ b/src/projections/ccon.cpp
@@ -24,7 +24,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
#define EPS10 1e-10
diff --git a/src/projections/eqdc.cpp b/src/projections/eqdc.cpp
index 00aacfda..84e37910 100644
--- a/src/projections/eqdc.cpp
+++ b/src/projections/eqdc.cpp
@@ -5,7 +5,7 @@
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
namespace { // anonymous namespace
struct pj_opaque {
diff --git a/src/projections/geos.cpp b/src/projections/geos.cpp
index 7999b21f..fcd7d4ee 100644
--- a/src/projections/geos.cpp
+++ b/src/projections/geos.cpp
@@ -34,7 +34,7 @@
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
namespace { // anonymous namespace
struct pj_opaque {
diff --git a/src/projections/gnom.cpp b/src/projections/gnom.cpp
index f7cb2635..23dee030 100644
--- a/src/projections/gnom.cpp
+++ b/src/projections/gnom.cpp
@@ -5,7 +5,7 @@
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(gnom, "Gnomonic") "\n\tAzi, Sph";
diff --git a/src/projections/isea.cpp b/src/projections/isea.cpp
index d1aeab4a..c712d7ea 100644
--- a/src/projections/isea.cpp
+++ b/src/projections/isea.cpp
@@ -15,7 +15,7 @@
#define PJ_LIB__
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
#define DEG36 0.62831853071795864768
#define DEG72 1.25663706143591729537
diff --git a/src/projections/laea.cpp b/src/projections/laea.cpp
index 8a23c504..a1e4bf8f 100644
--- a/src/projections/laea.cpp
+++ b/src/projections/laea.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(laea, "Lambert Azimuthal Equal Area") "\n\tAzi, Sph&Ell";
diff --git a/src/projections/lcc.cpp b/src/projections/lcc.cpp
index beb2efd1..02530d5b 100644
--- a/src/projections/lcc.cpp
+++ b/src/projections/lcc.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(lcc, "Lambert Conformal Conic")
"\n\tConic, Sph&Ell\n\tlat_1= and lat_2= or lat_0, k_0=";
diff --git a/src/projections/merc.cpp b/src/projections/merc.cpp
index 10b8bb90..a77d7517 100644
--- a/src/projections/merc.cpp
+++ b/src/projections/merc.cpp
@@ -5,7 +5,7 @@
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(merc, "Mercator") "\n\tCyl, Sph&Ell\n\tlat_ts=";
PROJ_HEAD(webmerc, "Web Mercator / Pseudo Mercator") "\n\tCyl, Ell\n\t";
diff --git a/src/projections/mod_ster.cpp b/src/projections/mod_ster.cpp
index 8e02ea72..c7a8e899 100644
--- a/src/projections/mod_ster.cpp
+++ b/src/projections/mod_ster.cpp
@@ -3,7 +3,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(mil_os, "Miller Oblated Stereographic") "\n\tAzi(mod)";
PROJ_HEAD(lee_os, "Lee Oblated Stereographic") "\n\tAzi(mod)";
diff --git a/src/projections/nsper.cpp b/src/projections/nsper.cpp
index d641e1b6..059b9f71 100644
--- a/src/projections/nsper.cpp
+++ b/src/projections/nsper.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
namespace { // anonymous namespace
enum Mode {
diff --git a/src/projections/oea.cpp b/src/projections/oea.cpp
index ac0f643f..cbedf0c0 100644
--- a/src/projections/oea.cpp
+++ b/src/projections/oea.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(oea, "Oblated Equal Area") "\n\tMisc Sph\n\tn= m= theta=";
diff --git a/src/projections/ortho.cpp b/src/projections/ortho.cpp
index 94764756..34b6b689 100644
--- a/src/projections/ortho.cpp
+++ b/src/projections/ortho.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(ortho, "Orthographic") "\n\tAzi, Sph";
diff --git a/src/projections/robin.cpp b/src/projections/robin.cpp
index c08ac0e2..2e36106a 100644
--- a/src/projections/robin.cpp
+++ b/src/projections/robin.cpp
@@ -1,7 +1,7 @@
#define PJ_LIB__
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(robin, "Robinson") "\n\tPCyl, Sph";
diff --git a/src/projections/sconics.cpp b/src/projections/sconics.cpp
index 1a16fe24..60965c21 100644
--- a/src/projections/sconics.cpp
+++ b/src/projections/sconics.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
namespace { // anonymous namespace
diff --git a/src/projections/stere.cpp b/src/projections/stere.cpp
index 683d484c..afcf5f02 100644
--- a/src/projections/stere.cpp
+++ b/src/projections/stere.cpp
@@ -2,7 +2,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(stere, "Stereographic") "\n\tAzi, Sph&Ell\n\tlat_ts=";
PROJ_HEAD(ups, "Universal Polar Stereographic") "\n\tAzi, Sph&Ell\n\tsouth";
diff --git a/src/projections/sterea.cpp b/src/projections/sterea.cpp
index ca3bfd06..55404c86 100644
--- a/src/projections/sterea.cpp
+++ b/src/projections/sterea.cpp
@@ -27,7 +27,7 @@
#include <errno.h>
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
namespace { // anonymous namespace
diff --git a/src/projections/tmerc.cpp b/src/projections/tmerc.cpp
index bb56f8ae..5c76b141 100644
--- a/src/projections/tmerc.cpp
+++ b/src/projections/tmerc.cpp
@@ -17,7 +17,7 @@
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(tmerc, "Transverse Mercator") "\n\tCyl, Sph&Ell\n\tapprox";
diff --git a/src/projections/tobmerc.cpp b/src/projections/tobmerc.cpp
index 7215f0db..a1616036 100644
--- a/src/projections/tobmerc.cpp
+++ b/src/projections/tobmerc.cpp
@@ -5,7 +5,7 @@
#include "proj.h"
#include "proj_internal.h"
-#include "proj_math.h"
+#include <math.h>
PROJ_HEAD(tobmerc, "Tobler-Mercator") "\n\tCyl, Sph";
diff --git a/src/projections/tpeqd.cpp b/src/projections/tpeqd.cpp
index b306968c..0bc3be87 100644
--- a/src/projections/tpeqd.cpp
+++ b/src/projections/tpeqd.cpp
@@ -1,7 +1,7 @@
#define PJ_LIB__
#include <errno.h>
#include "proj.h"
-#include "proj_math.h"
+#include <math.h>
#include "proj_internal.h"