diff options
| author | Howard Butler <howard@hobu.co> | 2015-09-10 10:59:27 -0500 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2015-09-10 10:59:27 -0500 |
| commit | 5fc1cf8c73aae71bc563bc69424a4f7cd7a31bb5 (patch) | |
| tree | 024cdf06145d649762aedbbc924de8e9faa5545d /src | |
| parent | e7f77eb911a134f33ab9945d996195cf5f31b5f3 (diff) | |
| parent | 9ccc33c3db89d95cdaa60a5977d2c90d4999c124 (diff) | |
| download | PROJ-5fc1cf8c73aae71bc563bc69424a4f7cd7a31bb5.tar.gz PROJ-5fc1cf8c73aae71bc563bc69424a4f7cd7a31bb5.zip | |
Merge pull request #305 from sisyphus/win32-PVALUE-issue-ticket-#273
Win32 pvalue issue ticket #273
Diffstat (limited to 'src')
| -rw-r--r-- | src/pj_param.c | 16 | ||||
| -rw-r--r-- | src/projects.h | 4 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/pj_param.c b/src/pj_param.c index ed6ce27c..434d4535 100644 --- a/src/pj_param.c +++ b/src/pj_param.c @@ -23,22 +23,22 @@ pj_mkparam(char *str) { /* character in `opt' is a parameter type which can take the */ /* values: */ /* */ -/* `t' - test for presence, return TRUE/FALSE in PVALUE.i */ -/* `i' - integer value returned in PVALUE.i */ -/* `d' - simple valued real input returned in PVALUE.f */ +/* `t' - test for presence, return TRUE/FALSE in PROJVALUE.i */ +/* `i' - integer value returned in PROJVALUE.i */ +/* `d' - simple valued real input returned in PROJVALUE.f */ /* `r' - degrees (DMS translation applied), returned as */ -/* radians in PVALUE.f */ -/* `s' - string returned in PVALUE.s */ -/* `b' - test for t/T/f/F, return in PVALUE.i */ +/* radians in PROJVALUE.f */ +/* `s' - string returned in PROJVALUE.s */ +/* `b' - test for t/T/f/F, return in PROJVALUE.i */ /* */ /************************************************************************/ - PVALUE /* test for presence or get parameter value */ + PROJVALUE /* test for presence or get parameter value */ pj_param(projCtx ctx, paralist *pl, const char *opt) { int type; unsigned l; - PVALUE value; + PROJVALUE value; if( ctx == NULL ) ctx = pj_get_default_ctx(); diff --git a/src/projects.h b/src/projects.h index ac95f69d..fe6a44c6 100644 --- a/src/projects.h +++ b/src/projects.h @@ -156,7 +156,7 @@ typedef struct { double x, y; } XY; typedef struct { double lam, phi; } LP; #endif -typedef union { double f; int i; char *s; } PVALUE; +typedef union { double f; int i; char *s; } PROJVALUE; struct PJconsts; struct PJ_LIST { @@ -395,7 +395,7 @@ void set_rtodms(int, int); char *rtodms(char *, double, int, int); double adjlon(double); double aacos(projCtx,double), aasin(projCtx,double), asqrt(double), aatan2(double, double); -PVALUE pj_param(projCtx ctx, paralist *, const char *); +PROJVALUE pj_param(projCtx ctx, paralist *, const char *); paralist *pj_mkparam(char *); int pj_ell_set(projCtx ctx, paralist *, double *, double *); int pj_datum_set(projCtx,paralist *, PJ *); |