diff options
| author | Kristian Evers <kristianevers@gmail.com> | 2018-10-16 22:30:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-16 22:30:23 +0200 |
| commit | 73f7c0eead0cf6fdcf247cd9368cc7d5f72a1f2c (patch) | |
| tree | 63ab16e3fed0243472758809ecb29be38de9f916 /src/pj_list.c | |
| parent | 117a3f41c02db4e1413617a948a34083c325c3ea (diff) | |
| parent | 526fe4975e789e3437646adbe86608616eac21fe (diff) | |
| download | PROJ-iso19111_dev.tar.gz PROJ-iso19111_dev.zip | |
Merge pull request #1148 from kbevers/lists-to-proj.hiso19111_dev
Move struct definitions for proj_list_* functions to proj.h
Diffstat (limited to 'src/pj_list.c')
| -rw-r--r-- | src/pj_list.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/pj_list.c b/src/pj_list.c index d34e055d..33313875 100644 --- a/src/pj_list.c +++ b/src/pj_list.c @@ -14,7 +14,7 @@ #undef PROJ_HEAD /* Generate extern declarations for description strings */ -#define PROJ_HEAD(id, name) extern char * const pj_s_##id; +#define PROJ_HEAD(id, name) extern const char * const pj_s_##id; #include "pj_list.h" #undef PROJ_HEAD @@ -22,16 +22,11 @@ #define PROJ_HEAD(id, name) {#id, pj_##id, &pj_s_##id}, const struct PJ_LIST pj_list[] = { #include "pj_list.h" - {0, 0, 0}, - }; + {0, 0, 0}, +}; #undef PROJ_HEAD -struct PJ_LIST *pj_get_list_ref() -{ - return (struct PJ_LIST *)pj_list; -} - const PJ_OPERATIONS *proj_list_operations(void) { return pj_list; } |