Skip to content

Commit 5b67508

Browse files
authored
Merge pull request #383 from devrimgunduz/master
Fix build against PostgreSQL 19
2 parents 473701f + bf8302b commit 5b67508

2 files changed

Lines changed: 10 additions & 5 deletions

File tree

pgsql/pc_access.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Datum pcpoint_get_values(PG_FUNCTION_ARGS)
126126
PG_RETURN_ARRAYTYPE_P(result);
127127
}
128128

129-
static inline bool array_get_isnull(const bits8 *nullbitmap, int offset)
129+
static inline bool array_get_isnull(const uint8 *nullbitmap, int offset)
130130
{
131131
if (nullbitmap == NULL)
132132
{
@@ -147,7 +147,7 @@ pcpatch_from_point_array(ArrayType *array, FunctionCallInfo fcinfo)
147147
#endif
148148
{
149149
int nelems;
150-
bits8 *bitmap;
150+
uint8 *bitmap;
151151
size_t offset = 0;
152152
int i;
153153
uint32 pcid = 0;
@@ -222,7 +222,7 @@ pcpatch_from_patch_array(ArrayType *array, FunctionCallInfo fcinfo)
222222
#endif
223223
{
224224
int nelems;
225-
bits8 *bitmap;
225+
uint8 *bitmap;
226226
size_t offset = 0;
227227
int i;
228228
uint32 pcid = 0;
@@ -1127,7 +1127,7 @@ const char **array_to_cstring_array(ArrayType *array, int *size)
11271127
int i, j, offset = 0;
11281128
int nelems = ArrayGetNItems(ARR_NDIM(array), ARR_DIMS(array));
11291129
const char **cstring = nelems ? pcalloc(nelems * sizeof(char *)) : NULL;
1130-
bits8 *bitmap = ARR_NULLBITMAP(array);
1130+
uint8 *bitmap = ARR_NULLBITMAP(array);
11311131
for (i = j = 0; i < nelems; ++i)
11321132
{
11331133
text *array_text;

pgsql/pc_pgsql.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,14 @@ static Oid pointcloud_get_full_version_schema()
5252
#if PGSQL_VERSION < 140
5353
FuncCandidateList clist =
5454
FuncnameGetCandidates(names, -1, NIL, false, false, false);
55-
#else
55+
#elif PGSQL_VERSION < 190
5656
FuncCandidateList clist =
5757
FuncnameGetCandidates(names, -1, NIL, false, false, false, false);
58+
#else
59+
int fgc_flags;
60+
FuncCandidateList clist =
61+
FuncnameGetCandidates(names, -1, NIL, false, false, false, false,
62+
&fgc_flags);
5863
#endif
5964
if (!clist)
6065
return InvalidOid;

0 commit comments

Comments
 (0)