diff options
| author | Frank Warmerdam <warmerdam@pobox.com> | 2002-07-08 02:32:05 +0000 |
|---|---|---|
| committer | Frank Warmerdam <warmerdam@pobox.com> | 2002-07-08 02:32:05 +0000 |
| commit | 22b01721aee54803d0d0d5566e4a9b2ef1384382 (patch) | |
| tree | 1a2f1b797d3c9549518a5cc778201f1366e10e88 /src/pj_init.c | |
| parent | d26cb6597ecd1c6b612d0159651cd607f9003a09 (diff) | |
| download | PROJ-22b01721aee54803d0d0d5566e4a9b2ef1384382.tar.gz PROJ-22b01721aee54803d0d0d5566e4a9b2ef1384382.zip | |
ensure clean C++ builds
git-svn-id: http://svn.osgeo.org/metacrs/proj/trunk@1025 4e78687f-474d-0410-85f9-8d5e500ac6b2
Diffstat (limited to 'src/pj_init.c')
| -rw-r--r-- | src/pj_init.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pj_init.c b/src/pj_init.c index ef002a87..39cb7c81 100644 --- a/src/pj_init.c +++ b/src/pj_init.c @@ -91,7 +91,7 @@ pj_init_plus( const char *definition ) PJ *result; /* make a copy that we can manipulate */ - defn_copy = pj_malloc( strlen(definition)+1 ); + defn_copy = (char *) pj_malloc( strlen(definition)+1 ); strcpy( defn_copy, definition ); /* split into arguments based on '+' and trim white space */ @@ -141,7 +141,7 @@ pj_init_plus( const char *definition ) PJ * pj_init(int argc, char **argv) { char *s, *name; - void *(*proj)(PJ *); + PJ *(*proj)(PJ *); paralist *curr; int i; PJ *PIN = 0; @@ -175,7 +175,7 @@ pj_init(int argc, char **argv) { /* set defaults, unless inhibited */ if (!pj_param(start, "bno_defs").i) curr = get_defaults(curr, name); - proj = pj_list[i].proj; + proj = (PJ *(*)(PJ *)) pj_list[i].proj; /* allocate projection structure */ if (!(PIN = (*proj)(0))) goto bum_call; |