aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNyall Dawson <nyall.dawson@gmail.com>2019-06-03 09:05:35 +1000
committerNyall Dawson <nyall.dawson@gmail.com>2019-06-03 16:55:32 +1000
commita7a765199ea75cbc04b4473bca6afef2385a4a50 (patch)
treef6ec1cd47e1e377a33ae93ff40e8e87f34137f48 /src
parentee34d0684d62abb0eec3163733d13704a817878a (diff)
downloadPROJ-a7a765199ea75cbc04b4473bca6afef2385a4a50.tar.gz
PROJ-a7a765199ea75cbc04b4473bca6afef2385a4a50.zip
Fix incorrect delimator ";" used to separate proj_info().searchpath
entries on non-windows platforms, should be ":"
Diffstat (limited to 'src')
-rw-r--r--src/4D_api.cpp4
-rw-r--r--src/proj.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/src/4D_api.cpp b/src/4D_api.cpp
index 81e16600..4022b5be 100644
--- a/src/4D_api.cpp
+++ b/src/4D_api.cpp
@@ -1367,9 +1367,9 @@ static char *path_append (char *buf, const char *app, size_t *buf_size) {
}
assert(buf);
- /* Only append a semicolon if something's already there */
+ /* Only append a delimiter if something's already there */
if (0 != buflen)
- strcat (buf, ";");
+ strcat (buf, delim);
strcat (buf, app);
return buf;
}
diff --git a/src/proj.h b/src/proj.h
index a39d3150..2edcdc27 100644
--- a/src/proj.h
+++ b/src/proj.h
@@ -277,7 +277,8 @@ struct PJ_INFO {
const char *version; /* Full version number */
const char *searchpath; /* Paths where init and grid files are */
/* looked for. Paths are separated by */
- /* semi-colons. */
+ /* semi-colons on Windows, and colons */
+ /* on non-Windows platforms. */
const char * const *paths;
size_t path_count;
};