diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2018-12-20 18:45:15 +0100 |
|---|---|---|
| committer | Even Rouault <even.rouault@spatialys.com> | 2018-12-26 10:08:55 +0100 |
| commit | 80dad6ef2bed4a83008db06986dc168918d48476 (patch) | |
| tree | 41b4675d169f849516649700ab4f50d4cffa4c02 /src | |
| parent | 0a4afc8affdb97edc65863eeaaf62f7513910c9f (diff) | |
| download | PROJ-80dad6ef2bed4a83008db06986dc168918d48476.tar.gz PROJ-80dad6ef2bed4a83008db06986dc168918d48476.zip | |
cpp conversion: revert geodesic.cpp to geodesic.c
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/geodesic.c (renamed from src/geodesic.cpp) | 4 | ||||
| -rw-r--r-- | src/lib_proj.cmake | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 4b762924..e8b9977c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -201,7 +201,7 @@ libproj_la_SOURCES = \ nad_cvt.cpp nad_init.cpp nad_intr.cpp \ apply_gridshift.cpp datums.cpp datum_set.cpp transform.cpp \ geocent.cpp geocent.h utils.cpp gridinfo.cpp gridlist.cpp \ - jniproj.cpp mutex.cpp initcache.cpp apply_vgridshift.cpp geodesic.cpp \ + jniproj.cpp mutex.cpp initcache.cpp apply_vgridshift.cpp geodesic.c \ strtod.cpp math.cpp \ \ 4D_api.cpp pipeline.cpp \ diff --git a/src/geodesic.cpp b/src/geodesic.c index 705056b6..5504cb3b 100644 --- a/src/geodesic.cpp +++ b/src/geodesic.c @@ -34,6 +34,10 @@ #define HAVE_C99_MATH 0 #endif +#if !defined(__cplusplus) +#define nullptr 0 +#endif + #define GEOGRAPHICLIB_GEODESIC_ORDER 6 #define nA1 GEOGRAPHICLIB_GEODESIC_ORDER #define nC1 GEOGRAPHICLIB_GEODESIC_ORDER diff --git a/src/lib_proj.cmake b/src/lib_proj.cmake index 57a2f9ef..767106e6 100644 --- a/src/lib_proj.cmake +++ b/src/lib_proj.cmake @@ -215,7 +215,7 @@ SET(SRC_LIBPROJ_CORE nad_cvt.cpp nad_init.cpp nad_intr.cpp apply_gridshift.cpp datums.cpp datum_set.cpp transform.cpp geocent.cpp geocent.h utils.cpp gridinfo.cpp gridlist.cpp - jniproj.cpp mutex.cpp initcache.cpp apply_vgridshift.cpp geodesic.cpp + jniproj.cpp mutex.cpp initcache.cpp apply_vgridshift.cpp geodesic.c strtod.cpp math.cpp 4D_api.cpp pipeline.cpp internal.cpp |