From 4c8d48d6261e539d363c9e77fd2427cbe6d056cd Mon Sep 17 00:00:00 2001
From: Frank Warmerdam <warmerdam@pobox.com>
Date: Wed, 14 Mar 2012 01:27:57 +0000
Subject: avoid using macro expansion directly in #include to simplify code

git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@2196 4e78687f-474d-0410-85f9-8d5e500ac6b2
---
 src/projects.h | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

(limited to 'src/projects.h')

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
-- 
cgit v1.2.3