From a7a765199ea75cbc04b4473bca6afef2385a4a50 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 3 Jun 2019 09:05:35 +1000 Subject: Fix incorrect delimator ";" used to separate proj_info().searchpath entries on non-windows platforms, should be ":" --- src/4D_api.cpp | 4 ++-- src/proj.h | 3 ++- 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; }; -- cgit v1.2.3