Skip to content

Commit ea63be4

Browse files
committed
[PBCKP-245] don't include sys/stat.h so often
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.
1 parent 798986c commit ea63be4

File tree

15 files changed

+5
-17
lines changed

15 files changed

+5
-17
lines changed

src/backup.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "pgtar.h"
1818
#include "streamutil.h"
1919

20-
#include <sys/stat.h>
2120
#include <time.h>
2221
#include <unistd.h>
2322

src/catalog.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313

1414
#include <dirent.h>
1515
#include <signal.h>
16-
#include <sys/stat.h>
1716
#include <unistd.h>
1817

1918
#include "utils/file.h"

src/catchup.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "pgtar.h"
1818
#include "streamutil.h"
1919

20-
#include <sys/stat.h>
2120
#include <time.h>
2221
#include <unistd.h>
2322

src/checkdb.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "pg_probackup.h"
1818

19-
#include <sys/stat.h>
2019
#include <time.h>
2120
#include <unistd.h>
2221

src/data.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "utils/file.h"
1717

1818
#include <unistd.h>
19-
#include <sys/stat.h>
2019

2120
#ifdef HAVE_LIBZ
2221
#include <zlib.h>

src/dir.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
#include "catalog/pg_tablespace.h"
2020

2121
#include <unistd.h>
22-
#include <sys/stat.h>
2322
#include <dirent.h>
2423

2524
#include "utils/configuration.h"

src/fetch.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include "pg_probackup.h"
1212

13-
#include <sys/stat.h>
1413
#include <unistd.h>
1514

1615
/*

src/init.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include "pg_probackup.h"
1212

1313
#include <unistd.h>
14-
#include <sys/stat.h>
1514

1615
/*
1716
* Initialize backup catalog.

src/merge.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include "pg_probackup.h"
1111

12-
#include <sys/stat.h>
1312
#include <unistd.h>
1413

1514
#include "utils/thread.h"

src/pg_probackup.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@
4747
#include "streamutil.h"
4848
#include "utils/file.h"
4949

50-
#include <sys/stat.h>
51-
5250
#include "utils/configuration.h"
5351
#include "utils/thread.h"
5452
#include <time.h>

src/restore.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212

1313
#include "access/timeline.h"
1414

15-
#include <sys/stat.h>
1615
#include <unistd.h>
1716

1817
#include "utils/thread.h"

src/show.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#include <time.h>
1414
#include <dirent.h>
1515
#include <locale.h>
16-
#include <sys/stat.h>
1716

1817
#include "utils/json.h"
1918

src/utils/file.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
#include <unistd.h>
33

44
#include "pg_probackup.h"
5-
/* sys/stat.h must be included after pg_probackup.h (see problems with compilation for windows described in PGPRO-5750) */
6-
#include <sys/stat.h>
75
#include <signal.h>
86

97
#include "file.h"

src/utils/file.h

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33

44
#include "storage/bufpage.h"
55
#include <stdio.h>
6+
#ifndef WIN32
67
#include <sys/stat.h>
8+
#endif
79
#include <dirent.h>
810

911
#ifdef HAVE_LIBZ
@@ -223,11 +225,13 @@ fobj_iface(pioWriteFlush);
223225
fobj_iface(pioWriteCloser);
224226
fobj_iface(pioReadCloser);
225227

228+
typedef struct stat stat_t;
229+
226230
// Drive
227231
#define mth__pioOpen pioFile_i, (path_t, path), (int, flags), \
228232
(int, permissions), (err_i *, err)
229233
#define mth__pioOpen__optional() (permissions, FILE_PERMISSION)
230-
#define mth__pioStat struct stat, (path_t, path), (bool, follow_symlink), \
234+
#define mth__pioStat stat_t, (path_t, path), (bool, follow_symlink), \
231235
(err_i *, err)
232236
#define mth__pioRemove err_i, (path_t, path), (bool, missing_ok)
233237
#define mth__pioRename err_i, (path_t, old_path), (path_t, new_path)

src/validate.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
#include "pg_probackup.h"
1212

13-
#include <sys/stat.h>
1413
#include <dirent.h>
1514

1615
#include "utils/thread.h"

0 commit comments

Comments
 (0)