diff options
| author | Even Rouault <even.rouault@mines-paris.org> | 2017-12-18 13:42:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-18 13:42:38 +0100 |
| commit | 5bd4aef074ed3d9041e252be53fd2810ec40a02f (patch) | |
| tree | 945f42cf3d587a7ed29b6ac7fea7b62260516514 /src/pj_datums.c | |
| parent | e073e13b4d7c830d1e7144c22a1ab1c225f47a39 (diff) | |
| parent | a07501a165e6f2521c9aa13fa63fab33cf67d876 (diff) | |
| download | PROJ-5bd4aef074ed3d9041e252be53fd2810ec40a02f.tar.gz PROJ-5bd4aef074ed3d9041e252be53fd2810ec40a02f.zip | |
Merge pull request #674 from aaronpuchert/const-globals
Declare non-local variables as const where possible
Diffstat (limited to 'src/pj_datums.c')
| -rw-r--r-- | src/pj_datums.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/pj_datums.c b/src/pj_datums.c index c9655cd6..834ce724 100644 --- a/src/pj_datums.c +++ b/src/pj_datums.c @@ -25,8 +25,9 @@ * DEALINGS IN THE SOFTWARE. *****************************************************************************/ -#define PJ_DATUMS__ +#include "proj.h" +#define PJ_DATUMS__ #include <projects.h> /* @@ -35,7 +36,7 @@ * datum name for the comments if available. */ -C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = { +C_NAMESPACE_VAR const struct PJ_DATUMS pj_datums[] = { /* id definition ellipse comments */ /* -- ---------- ------- -------- */ {"WGS84", "towgs84=0,0,0", "WGS84", ""}, @@ -65,12 +66,11 @@ C_NAMESPACE_VAR struct PJ_DATUMS pj_datums[] = { }; struct PJ_DATUMS *pj_get_datums_ref() - { - return pj_datums; + return (struct PJ_DATUMS *)pj_datums; } -C_NAMESPACE_VAR struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { +C_NAMESPACE_VAR const struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { /* id definition */ /* -- ---------- */ {"greenwich", "0dE"}, @@ -90,8 +90,11 @@ C_NAMESPACE_VAR struct PJ_PRIME_MERIDIANS pj_prime_meridians[] = { }; struct PJ_PRIME_MERIDIANS *pj_get_prime_meridians_ref() +{ + return (struct PJ_PRIME_MERIDIANS *)pj_prime_meridians; +} +const PJ_PRIME_MERIDIANS *proj_list_prime_meridians(void) { return pj_prime_meridians; } - |