Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 0b9a48d

Browse files
anarazelpull[bot]
authored andcommitted
Don't define FRONTEND for initdb
No headers requiring FRONTED to be defined are included as of af1a949. Since this is the last user of (contrib|frontend)_defines in Mkvcbuild.pm, remove them. Discussion: https://postgr.es/m/20220820194550.725755r6fj2ro3rx@awork3.anarazel.de
1 parent bffc2bc commit 0b9a48d

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

src/bin/initdb/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ subdir = src/bin/initdb
1616
top_builddir = ../../..
1717
include $(top_builddir)/src/Makefile.global
1818

19-
override CPPFLAGS := -DFRONTEND -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS)
19+
override CPPFLAGS := -I$(libpq_srcdir) -I$(top_srcdir)/src/timezone $(CPPFLAGS)
2020

2121
# Note: it's important that we link to encnames.o from libpgcommon, not
2222
# from libpq, else we have risks of version skew if we run with a libpq

src/tools/msvc/Mkvcbuild.pm

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ my $libpq;
3535
my @unlink_on_exit;
3636

3737
# Set of variables for modules in contrib/ and src/test/modules/
38-
my $contrib_defines = {};
3938
my @contrib_uselibpq = ();
4039
my @contrib_uselibpgport = ();
4140
my @contrib_uselibpgcommon = ();
@@ -53,7 +52,6 @@ my @contrib_excludes = (
5352
'unsafe_tests');
5453

5554
# Set of variables for frontend modules
56-
my $frontend_defines = { 'initdb' => 'FRONTEND' };
5755
my @frontend_uselibpq =
5856
('pg_amcheck', 'pg_ctl', 'pg_upgrade', 'pgbench', 'psql', 'initdb');
5957
my @frontend_uselibpgport = (
@@ -1126,28 +1124,27 @@ sub AdjustContribProj
11261124
{
11271125
my $proj = shift;
11281126
AdjustModule(
1129-
$proj, $contrib_defines,
1130-
\@contrib_uselibpq, \@contrib_uselibpgport,
1131-
\@contrib_uselibpgcommon, $contrib_extralibs,
1132-
$contrib_extrasource, $contrib_extraincludes);
1127+
$proj, \@contrib_uselibpq,
1128+
\@contrib_uselibpgport, \@contrib_uselibpgcommon,
1129+
$contrib_extralibs, $contrib_extrasource,
1130+
$contrib_extraincludes);
11331131
return;
11341132
}
11351133

11361134
sub AdjustFrontendProj
11371135
{
11381136
my $proj = shift;
11391137
AdjustModule(
1140-
$proj, $frontend_defines,
1141-
\@frontend_uselibpq, \@frontend_uselibpgport,
1142-
\@frontend_uselibpgcommon, $frontend_extralibs,
1143-
$frontend_extrasource, $frontend_extraincludes);
1138+
$proj, \@frontend_uselibpq,
1139+
\@frontend_uselibpgport, \@frontend_uselibpgcommon,
1140+
$frontend_extralibs, $frontend_extrasource,
1141+
$frontend_extraincludes);
11441142
return;
11451143
}
11461144

11471145
sub AdjustModule
11481146
{
11491147
my $proj = shift;
1150-
my $module_defines = shift;
11511148
my $module_uselibpq = shift;
11521149
my $module_uselibpgport = shift;
11531150
my $module_uselibpgcommon = shift;
@@ -1156,13 +1153,6 @@ sub AdjustModule
11561153
my $module_extraincludes = shift;
11571154
my $n = $proj->{name};
11581155

1159-
if ($module_defines->{$n})
1160-
{
1161-
foreach my $d ($module_defines->{$n})
1162-
{
1163-
$proj->AddDefine($d);
1164-
}
1165-
}
11661156
if (grep { /^$n$/ } @{$module_uselibpq})
11671157
{
11681158
$proj->AddIncludeDir('src\interfaces\libpq');

0 commit comments

Comments
 (0)