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 48c5b10678b Fix compile errors for port
48c5b10678b is described below
commit 48c5b10678b5dd4e1b95e9d6527330cf7cbf3b3c
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Oct 7 21:00:55 2025 +0800
Fix compile errors for port
---
src/port/win32stat.c | 11 -----------
1 file changed, 11 deletions(-)
diff --git a/src/port/win32stat.c b/src/port/win32stat.c
index 9c666315122..af87117a516 100644
--- a/src/port/win32stat.c
+++ b/src/port/win32stat.c
@@ -257,12 +257,7 @@ int
_pgfstat64(int fileno, struct stat *buf)
{
HANDLE hFile = (HANDLE) _get_osfhandle(fileno);
-<<<<<<< HEAD
BY_HANDLE_FILE_INFORMATION fiData;
-=======
- DWORD fileType = FILE_TYPE_UNKNOWN;
- unsigned short st_mode;
->>>>>>> REL_16_9
if (buf == NULL)
{
@@ -270,7 +265,6 @@ _pgfstat64(int fileno, struct stat *buf)
return -1;
}
-<<<<<<< HEAD
/*
* Check if the fileno is a data stream. If so, unless it has been
* redirected to a file, getting information through its HANDLE will
fail,
@@ -294,11 +288,6 @@ _pgfstat64(int fileno, struct stat *buf)
* Since we already have a file handle there is no need to check for
* ERROR_DELETE_PENDING.
*/
-=======
- fileType = pgwin32_get_file_type(hFile);
- if (errno != 0)
- return -1;
->>>>>>> REL_16_9
switch (fileType)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
