=== Applying patches on top of PostgreSQL commit ID 213f0079b3415ad8f5f0a62d119ed1f0a448ad8f ===
/etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables  is obsolete.  Please consider migrating to /etc/jail.conf.
Fri Mar 13 03:41:25 UTC 2026
On branch cf/6291
nothing to commit, working tree clean
=== using 'git am' to apply patch ./v10-0001-Support-using-copyObject-in-C.patch ===
Applying: Support using copyObject in C++
Using index info to reconstruct a base tree...
M	config/c-compiler.m4
M	configure
M	configure.ac
M	meson.build
M	src/include/c.h
M	src/include/pg_config.h.in
M	src/test/modules/test_cplusplusext/test_cplusplusext.cpp
Falling back to patching base and 3-way merge...
Auto-merging src/include/pg_config.h.in
Auto-merging src/include/c.h
CONFLICT (content): Merge conflict in src/include/c.h
Auto-merging meson.build
Auto-merging configure.ac
Auto-merging configure
Auto-merging config/c-compiler.m4
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Support using copyObject in C++
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Unstaged changes after reset:
M	configure
M	src/include/c.h
M	src/include/pg_config.h.in
=== using patch(1) to apply patch ./v10-0001-Support-using-copyObject-in-C.patch ===
patching file config/c-compiler.m4
Hunk #1 succeeded at 206 (offset 13 lines).
patching file configure
Hunk #1 succeeded at 15101 (offset 23 lines).
patching file configure.ac
Hunk #1 FAILED at 1732.
1 out of 1 hunk FAILED -- saving rejects to file configure.ac.rej
patching file meson.build
Hunk #1 succeeded at 2965 with fuzz 2 (offset 12 lines).
patching file src/include/c.h
Hunk #1 succeeded at 454 with fuzz 1 (offset 30 lines).
patching file src/include/pg_config.h.in
Hunk #1 succeeded at 458 (offset 7 lines).
patching file src/test/modules/test_cplusplusext/test_cplusplusext.cpp
Hunk #1 FAILED at 37.
Hunk #2 FAILED at 54.
2 out of 2 hunks FAILED -- saving rejects to file src/test/modules/test_cplusplusext/test_cplusplusext.cpp.rej
Unstaged changes after reset:
M	config/c-compiler.m4
M	configure
M	meson.build
M	src/include/c.h
M	src/include/pg_config.h.in
Removing configure.ac.rej
Removing src/test/modules/test_cplusplusext/test_cplusplusext.cpp.rej
=== using 'git apply' to apply patch ./v10-0001-Support-using-copyObject-in-C.patch ===
Applied patch to 'config/c-compiler.m4' cleanly.
Applied patch to 'configure' cleanly.
Applied patch to 'configure.ac' cleanly.
Applied patch to 'meson.build' cleanly.
Applied patch to 'src/include/c.h' with conflicts.
Applied patch to 'src/include/pg_config.h.in' cleanly.
Applied patch to 'src/test/modules/test_cplusplusext/test_cplusplusext.cpp' cleanly.
U src/include/c.h
diff --cc src/include/c.h
index 5b678283469,a4fee84398d..00000000000
--- a/src/include/c.h
+++ b/src/include/c.h
@@@ -443,7 -435,6 +443,10 @@@ extern "C++
   * [1]: https://www.open-std.org/jtc1/sc22/wg14/www/docs/n2927.htm#existing-decltype
   */
  #if defined(__cplusplus)
++<<<<<<< ours
 +#undef typeof
++=======
++>>>>>>> theirs
  #ifdef pg_cxx_typeof
  #define typeof(x) pg_cxx_typeof(x)
  #elif !defined(HAVE_CXX_TYPEOF)