diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_list.c | 2 | ||||
| -rw-r--r-- | src/projects.h | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/pj_list.c b/src/pj_list.c index 7d35811b..bb56ade9 100644 --- a/src/pj_list.c +++ b/src/pj_list.c @@ -1,7 +1,7 @@ /* Projection System: default list of projections ** Use local definition of PJ_LIST_H for subset. */ -#define PJ_LIST_H "pj_list.h" +#define USE_PJ_LIST_H 1 #include "projects.h" struct PJ_LIST *pj_get_list_ref() diff --git a/src/projects.h b/src/projects.h index fb49652d..e282ecb5 100644 --- a/src/projects.h +++ b/src/projects.h @@ -266,24 +266,18 @@ PROJ_PARMS__ #include "proj_api.h" /* Generate pj_list external or make list from include file */ -#ifndef PJ_LIST_H +#ifndef USE_PJ_LIST_H extern struct PJ_LIST pj_list[]; #else #define PROJ_HEAD(id, name) \ struct PJconsts *pj_##id(struct PJconsts*); extern char * const pj_s_##id; -#ifndef lint -#define DO_PJ_LIST_ID -#endif -#include PJ_LIST_H -#ifndef lint -#undef DO_PJ_LIST_ID -#endif +#include "pj_list.h" #undef PROJ_HEAD #define PROJ_HEAD(id, name) {#id, pj_##id, &pj_s_##id}, struct PJ_LIST pj_list[] = { -#include PJ_LIST_H +#include "pj_list.h" {0, 0, 0}, }; #undef PROJ_HEAD |