[PBCKP-245] don't include sys/stat.h so often

funny-falcon · funny-falcon · commit 3acd1a72b421 · 2022-09-20T12:24:32.000+03:00
Postgresql's 'port' library defines custom 'stat' and 'struct stat'.
It conflicts with system one in MinGW. We had to include either one
or another, but not both. It is easier to do if we include 'sys/stat.h'
only once and only in non-win32 environment.
diff --git a/src/backup.c b/src/backup.c
@@ -17,7 +17,6 @@
 #include "pgtar.h"
 #include "streamutil.h"
 
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/src/catalog.c b/src/catalog.c
@@ -13,7 +13,6 @@
 
 #include <dirent.h>
 #include <signal.h>
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "utils/file.h"
diff --git a/src/catchup.c b/src/catchup.c
@@ -17,7 +17,6 @@
 #include "pgtar.h"
 #include "streamutil.h"
 
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/src/checkdb.c b/src/checkdb.c
@@ -16,7 +16,6 @@
 
 #include "pg_probackup.h"
 
-#include <sys/stat.h>
 #include <time.h>
 #include <unistd.h>
 
diff --git a/src/data.c b/src/data.c
@@ -16,7 +16,6 @@
 #include "utils/file.h"
 
 #include <unistd.h>
-#include <sys/stat.h>
 
 #ifdef HAVE_LIBZ
 #include <zlib.h>
diff --git a/src/dir.c b/src/dir.c
@@ -19,7 +19,6 @@
 #include "catalog/pg_tablespace.h"
 
 #include <unistd.h>
-#include <sys/stat.h>
 #include <dirent.h>
 
 #include "utils/configuration.h"
diff --git a/src/fetch.c b/src/fetch.c
@@ -10,7 +10,6 @@
 
 #include "pg_probackup.h"
 
-#include <sys/stat.h>
 #include <unistd.h>
 
 /*
diff --git a/src/init.c b/src/init.c
@@ -11,7 +11,6 @@
 #include "pg_probackup.h"
 
 #include <unistd.h>
-#include <sys/stat.h>
 
 /*
  * Initialize backup catalog.
diff --git a/src/merge.c b/src/merge.c
@@ -9,7 +9,6 @@
 
 #include "pg_probackup.h"
 
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "utils/thread.h"
diff --git a/src/pg_probackup.c b/src/pg_probackup.c
@@ -47,8 +47,6 @@
 #include "streamutil.h"
 #include "utils/file.h"
 
-#include <sys/stat.h>
-
 #include "utils/configuration.h"
 #include "utils/thread.h"
 #include <time.h>
diff --git a/src/restore.c b/src/restore.c
@@ -12,7 +12,6 @@
 
 #include "access/timeline.h"
 
-#include <sys/stat.h>
 #include <unistd.h>
 
 #include "utils/thread.h"
diff --git a/src/show.c b/src/show.c
@@ -13,7 +13,6 @@
 #include <time.h>
 #include <dirent.h>
 #include <locale.h>
-#include <sys/stat.h>
 
 #include "utils/json.h"
 
diff --git a/src/utils/file.c b/src/utils/file.c
@@ -2,8 +2,6 @@
 #include <unistd.h>
 
 #include "pg_probackup.h"
-/* sys/stat.h must be included after pg_probackup.h (see problems with compilation for windows described in PGPRO-5750) */
-#include <sys/stat.h>
 #include <signal.h>
 
 #include "file.h"
diff --git a/src/utils/file.h b/src/utils/file.h
@@ -3,7 +3,9 @@
 
 #include "storage/bufpage.h"
 #include <stdio.h>
+#ifndef WIN32
 #include <sys/stat.h>
+#endif
 #include <dirent.h>
 
 #ifdef HAVE_LIBZ
@@ -223,11 +225,13 @@ fobj_iface(pioWriteFlush);
 fobj_iface(pioWriteCloser);
 fobj_iface(pioReadCloser);
 
+typedef struct stat stat_t;
+
 // Drive
 #define mth__pioOpen 		pioFile_i, (path_t, path), (int, flags), \
 									   (int, permissions), (err_i *, err)
 #define mth__pioOpen__optional() (permissions, FILE_PERMISSION)
-#define mth__pioStat 		struct stat, (path_t, path), (bool, follow_symlink), \
+#define mth__pioStat 		stat_t, (path_t, path), (bool, follow_symlink), \
 										 (err_i *, err)
 #define mth__pioRemove 		err_i, (path_t, path), (bool, missing_ok)
 #define mth__pioRename 		err_i, (path_t, old_path), (path_t, new_path)
diff --git a/src/validate.c b/src/validate.c
@@ -10,7 +10,6 @@
 
 #include "pg_probackup.h"
 
-#include <sys/stat.h>
 #include <dirent.h>
 
 #include "utils/thread.h"
