From 648aeb575db7af9ddd51cf17d1b56ee91e9ef3c5 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 25 Apr 2024 14:07:12 +0200 Subject: [PATCH] relocatable-lib-lgpl: Allow unconditional use of set_relocation_prefix. Reported by Reuben Thomas in . * lib/relocatable.h (set_relocation_prefix): Define in a dummy way if ENABLE_RELOCATABLE is not defined. --- ChangeLog | 8 ++++++++ lib/relocatable.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index fe6b355f4b..8d1e0e981b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2024-04-25 Bruno Haible + + relocatable-lib-lgpl: Allow unconditional use of set_relocation_prefix. + Reported by Reuben Thomas in + . + * lib/relocatable.h (set_relocation_prefix): Define in a dummy way if + ENABLE_RELOCATABLE is not defined. + 2024-04-25 Bruno Haible doc: Update target platforms list. diff --git a/lib/relocatable.h b/lib/relocatable.h index 162f9d82a4..0c10ebe2a1 100644 --- a/lib/relocatable.h +++ b/lib/relocatable.h @@ -109,6 +109,8 @@ extern char * compute_curr_prefix (const char *orig_installprefix, #else /* By default, we use the hardwired pathnames. */ +#define set_relocation_prefix(orig_prefix, curr_prefix) \ + ((void) (orig_prefix), (void) (curr_prefix)) #define relocate(pathname) (pathname) #define relocate2(pathname,allocatedp) (*(allocatedp) = NULL, (pathname)) -- 2.39.5