diff --git a/src/halfvec.c b/src/halfvec.c index 6854c3d..3771146 100644 --- a/src/halfvec.c +++ b/src/halfvec.c @@ -23,6 +23,10 @@ #include "varatt.h" #endif +#if PG_VERSION_NUM >= 170000 +#include "parser/scansup.h" +#endif + #define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1) #define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1)) @@ -133,9 +137,9 @@ InitHalfVector(int dim) return result; } -/* - * Check for whitespace, since array_isspace() is static - */ +#if PG_VERSION_NUM >= 170000 +#define halfvec_isspace(ch) scanner_isspace(ch) +#else static inline bool halfvec_isspace(char ch) { @@ -148,6 +152,7 @@ halfvec_isspace(char ch) return true; return false; } +#endif /* * Check state array diff --git a/src/sparsevec.c b/src/sparsevec.c index ca1648f..d7811c7 100644 --- a/src/sparsevec.c +++ b/src/sparsevec.c @@ -22,6 +22,10 @@ #include "varatt.h" #endif +#if PG_VERSION_NUM >= 170000 +#include "parser/scansup.h" +#endif + typedef struct SparseInputElement { int32 index; @@ -155,9 +159,9 @@ InitSparseVector(int dim, int nnz) return result; } -/* - * Check for whitespace, since array_isspace() is static - */ +#if PG_VERSION_NUM >= 170000 +#define sparsevec_isspace(ch) scanner_isspace(ch) +#else static inline bool sparsevec_isspace(char ch) { @@ -170,6 +174,7 @@ sparsevec_isspace(char ch) return true; return false; } +#endif /* * Compare indices diff --git a/src/vector.c b/src/vector.c index 4736838..96dcb76 100644 --- a/src/vector.c +++ b/src/vector.c @@ -26,6 +26,10 @@ #include "varatt.h" #endif +#if PG_VERSION_NUM >= 170000 +#include "parser/scansup.h" +#endif + #define STATE_DIMS(x) (ARR_DIMS(x)[0] - 1) #define CreateStateDatums(dim) palloc(sizeof(Datum) * (dim + 1)) @@ -129,9 +133,9 @@ InitVector(int dim) return result; } -/* - * Check for whitespace, since array_isspace() is static - */ +#if PG_VERSION_NUM >= 170000 +#define vector_isspace(ch) scanner_isspace(ch) +#else static inline bool vector_isspace(char ch) { @@ -144,6 +148,7 @@ vector_isspace(char ch) return true; return false; } +#endif /* * Check state array