This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 153638588bf Fix some compile error for xact.h c.h string.h
153638588bf is described below
commit 153638588bf9f0a0c7b8f8e97101e47eba35d969
Author: Jinbao Chen <[email protected]>
AuthorDate: Wed Sep 24 09:46:24 2025 +0800
Fix some compile error for xact.h c.h string.h
---
src/include/access/xact.h | 2 +-
src/include/c.h | 12 ++++++++++++
src/include/common/string.h | 1 -
3 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 71aa66ee2fb..2dbff2d709d 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -576,7 +576,7 @@ extern int xactGetCommittedChildren(TransactionId **ptr);
extern XLogRecPtr XactLogCommitRecord(TimestampTz commit_time,
Oid
tablespace_oid_to_delete_on_commit,
int
nsubxacts, TransactionId *subxacts,
- int
nrels, RelFileNodePendingDelete *rels, RelFileLocator *rels,
+ int
nrels, RelFileNodePendingDelete *rels,
int
ndroppedstats,
xl_xact_stats_item *droppedstats,
int
nmsgs, SharedInvalidationMessage *msgs,
diff --git a/src/include/c.h b/src/include/c.h
index ba094e287e9..ae7d1c0fba8 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -415,6 +415,18 @@ typedef void (*pg_funcptr_t) (void);
*/
#define FLEXIBLE_ARRAY_MEMBER /* empty */
+/* Which __func__ symbol do we have, if any? */
+#ifdef HAVE_FUNCNAME__FUNC
+#define PG_FUNCNAME_MACRO __func__
+#else
+#ifdef HAVE_FUNCNAME__FUNCTION
+#define PG_FUNCNAME_MACRO __FUNCTION__
+#else
+#define PG_FUNCNAME_MACRO NULL
+#endif
+#endif
+
+
/*
* Does the compiler support #pragma GCC system_header? We optionally use it
* to avoid warnings that we can't fix (e.g. in the perl headers).
diff --git a/src/include/common/string.h b/src/include/common/string.h
index 28783a2c73b..4df54db70df 100644
--- a/src/include/common/string.h
+++ b/src/include/common/string.h
@@ -44,6 +44,5 @@ extern char *simple_prompt_extended(const char *prompt, bool
echo,
/* functions in src/common/pg_get_line.c */
extern bool pg_get_line_buf(FILE *stream, struct StringInfoData *buf);
-extern bool pg_get_line_append(FILE *stream, struct StringInfoData *buf);
#endif /* COMMON_STRING_H */
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
