@@ -35,7 +35,6 @@ my $libpq;
35
35
my @unlink_on_exit ;
36
36
37
37
# Set of variables for modules in contrib/ and src/test/modules/
38
- my $contrib_defines = {};
39
38
my @contrib_uselibpq = ();
40
39
my @contrib_uselibpgport = ();
41
40
my @contrib_uselibpgcommon = ();
@@ -53,7 +52,6 @@ my @contrib_excludes = (
53
52
' unsafe_tests' );
54
53
55
54
# Set of variables for frontend modules
56
- my $frontend_defines = { ' initdb' => ' FRONTEND' };
57
55
my @frontend_uselibpq =
58
56
(' pg_amcheck' , ' pg_ctl' , ' pg_upgrade' , ' pgbench' , ' psql' , ' initdb' );
59
57
my @frontend_uselibpgport = (
@@ -1126,28 +1124,27 @@ sub AdjustContribProj
1126
1124
{
1127
1125
my $proj = shift ;
1128
1126
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 );
1133
1131
return ;
1134
1132
}
1135
1133
1136
1134
sub AdjustFrontendProj
1137
1135
{
1138
1136
my $proj = shift ;
1139
1137
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 );
1144
1142
return ;
1145
1143
}
1146
1144
1147
1145
sub AdjustModule
1148
1146
{
1149
1147
my $proj = shift ;
1150
- my $module_defines = shift ;
1151
1148
my $module_uselibpq = shift ;
1152
1149
my $module_uselibpgport = shift ;
1153
1150
my $module_uselibpgcommon = shift ;
@@ -1156,13 +1153,6 @@ sub AdjustModule
1156
1153
my $module_extraincludes = shift ;
1157
1154
my $n = $proj -> {name };
1158
1155
1159
- if ($module_defines -> {$n })
1160
- {
1161
- foreach my $d ($module_defines -> {$n })
1162
- {
1163
- $proj -> AddDefine($d );
1164
- }
1165
- }
1166
1156
if (grep { / ^$n $ / } @{$module_uselibpq })
1167
1157
{
1168
1158
$proj -> AddIncludeDir(' src\interfaces\libpq' );
0 commit comments