From 1c6ff24d4c6d813e4984c942857fd5c76f81b868 Mon Sep 17 00:00:00 2001 From: Michael Chirico Date: Tue, 10 Dec 2024 04:39:19 +0000 Subject: [PATCH] Version-guard STRING_PTR definition --- src/data.table.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/data.table.h b/src/data.table.h index 0ac2d21fa..f66d15d27 100644 --- a/src/data.table.h +++ b/src/data.table.h @@ -6,6 +6,7 @@ # define ALTREP(x) 0 // #2866 # define USE_RINTERNALS // #3301 # define DATAPTR_RO(x) ((const void *)DATAPTR(x)) +# define STRING_PTR_RO STRING_PTR # define R_Calloc(x, y) Calloc(x, y) // #6380 # define R_Realloc(x, y, z) Realloc(x, y, z) # define R_Free(x) Free(x) @@ -15,9 +16,6 @@ #endif #include #define SEXPPTR_RO(x) ((const SEXP *)DATAPTR_RO(x)) // to avoid overhead of looped STRING_ELT and VECTOR_ELT -#ifndef STRING_PTR_RO -#define STRING_PTR_RO STRING_PTR -#endif #include // for uint64_t rather than unsigned long long #include // for va_list, va_start #include