Cleaning up threading code

Applying: Add port/pg_threads.h for a common threading API.
Using index info to reconstruct a base tree...
M	configure
M	configure.ac
M	src/bin/pgbench/pgbench.c
M	src/include/port/pg_pthread.h
M	src/interfaces/ecpg/ecpglib/connect.c
M	src/interfaces/ecpg/ecpglib/descriptor.c
M	src/interfaces/ecpg/ecpglib/ecpglib_extern.h
M	src/interfaces/ecpg/ecpglib/memory.c
M	src/interfaces/ecpg/ecpglib/misc.c
M	src/interfaces/ecpg/include/ecpg_config.h.in
M	src/interfaces/ecpg/include/meson.build
M	src/interfaces/ecpg/test/expected/thread-alloc.c
M	src/interfaces/ecpg/test/expected/thread-descriptor.c
M	src/interfaces/ecpg/test/expected/thread-prep.c
M	src/interfaces/ecpg/test/expected/thread-thread.c
M	src/interfaces/ecpg/test/expected/thread-thread_implicit.c
M	src/interfaces/ecpg/test/thread/alloc.pgc
M	src/interfaces/ecpg/test/thread/descriptor.pgc
M	src/interfaces/ecpg/test/thread/prep.pgc
M	src/interfaces/ecpg/test/thread/thread.pgc
M	src/interfaces/ecpg/test/thread/thread_implicit.pgc
M	src/interfaces/libpq/Makefile
M	src/interfaces/libpq/fe-connect.c
M	src/interfaces/libpq/fe-secure-openssl.c
M	src/interfaces/libpq/fe-secure.c
M	src/interfaces/libpq/libpq-int.h
M	src/interfaces/libpq/meson.build
M	src/interfaces/libpq/pthread-win32.c
M	src/port/Makefile
M	src/port/meson.build
M	src/port/pthread_barrier_wait.c
M	src/tools/pginclude/headerscheck
M	src/tools/pgindent/typedefs.list
Falling back to patching base and 3-way merge...
Auto-merging src/tools/pgindent/typedefs.list
CONFLICT (content): Merge conflict in src/tools/pgindent/typedefs.list
Auto-merging src/tools/pginclude/headerscheck
CONFLICT (modify/delete): src/port/pthread_barrier_wait.c deleted in Add port/pg_threads.h for a common threading API. and modified in HEAD. Version HEAD of src/port/pthread_barrier_wait.c left in tree.
Removing src/port/pthread-win32.h
Auto-merging src/port/meson.build
Auto-merging src/port/Makefile
CONFLICT (modify/delete): src/interfaces/libpq/pthread-win32.c deleted in Add port/pg_threads.h for a common threading API. and modified in HEAD. Version HEAD of src/interfaces/libpq/pthread-win32.c left in tree.
Auto-merging src/interfaces/libpq/meson.build
Auto-merging src/interfaces/libpq/libpq-int.h
Auto-merging src/interfaces/libpq/fe-secure.c
Auto-merging src/interfaces/libpq/fe-secure-openssl.c
CONFLICT (content): Merge conflict in src/interfaces/libpq/fe-secure-openssl.c
Auto-merging src/interfaces/libpq/fe-connect.c
Auto-merging src/interfaces/libpq/Makefile
Auto-merging src/interfaces/ecpg/test/thread/thread_implicit.pgc
Auto-merging src/interfaces/ecpg/test/thread/thread.pgc
Auto-merging src/interfaces/ecpg/test/thread/prep.pgc
Auto-merging src/interfaces/ecpg/test/thread/descriptor.pgc
Auto-merging src/interfaces/ecpg/test/thread/alloc.pgc
Auto-merging src/interfaces/ecpg/test/expected/thread-thread_implicit.c
Auto-merging src/interfaces/ecpg/test/expected/thread-thread.c
Auto-merging src/interfaces/ecpg/test/expected/thread-prep.c
Auto-merging src/interfaces/ecpg/test/expected/thread-descriptor.c
Auto-merging src/interfaces/ecpg/test/expected/thread-alloc.c
Auto-merging src/interfaces/ecpg/include/meson.build
CONFLICT (content): Merge conflict in src/interfaces/ecpg/include/meson.build
Auto-merging src/interfaces/ecpg/include/ecpg_config.h.in
CONFLICT (content): Merge conflict in src/interfaces/ecpg/include/ecpg_config.h.in
Removing src/interfaces/ecpg/include/ecpg-pthread-win32.h
Auto-merging src/interfaces/ecpg/ecpglib/misc.c
CONFLICT (content): Merge conflict in src/interfaces/ecpg/ecpglib/misc.c
Auto-merging src/interfaces/ecpg/ecpglib/memory.c
Auto-merging src/interfaces/ecpg/ecpglib/ecpglib_extern.h
Auto-merging src/interfaces/ecpg/ecpglib/descriptor.c
Auto-merging src/interfaces/ecpg/ecpglib/connect.c
CONFLICT (modify/delete): src/include/port/pg_pthread.h deleted in Add port/pg_threads.h for a common threading API. and modified in HEAD. Version HEAD of src/include/port/pg_pthread.h left in tree.
Auto-merging src/bin/pgbench/pgbench.c
Auto-merging configure.ac
Auto-merging configure
CONFLICT (content): Merge conflict in configure
Patch failed at 0001 Add port/pg_threads.h for a common threading API.

error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"