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

Commit 7748e24

Browse files
committed
Make MSVC build system add HAVE_STDINT_H to pg_config.h for MSVC 2010 and above, because they have stdint.h
Conflicts: src/tools/msvc/Solution.pm
1 parent 81a3d74 commit 7748e24

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

src/tools/msvc/Solution.pm

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ sub _new
2323
VisualStudioVersion => undef,
2424
MinimumVisualStudioVersion => undef,
2525
vcver => undef,
26-
platform => undef, };
26+
platform => undef,
27+
have_stdint_h => 0};
2728
bless($self, $classname);
2829

2930
$self->DeterminePlatform();
@@ -172,6 +173,7 @@ sub GenerateFiles
172173
s{#define PGPRO_VERSION_STR "[^"]+"}{#define PGPRO_VERSION_STR PGPRO_PACKAGE_STR " compiled by Visual C++ build" __STRINGIFY2(_MSC_VER) ", $bits-bit"};
173174
print O;
174175
}
176+
print O "#define HAVE_STDINT_H\n" if $self->{have_stdint_h};
175177
print O "#define PG_MAJORVERSION \"$self->{majorver}\"\n";
176178
print O "#define LOCALEDIR \"/share/locale\"\n"
177179
if ($self->{options}->{nls});
@@ -255,18 +257,11 @@ sub GenerateFiles
255257
{
256258
print O "#define USE_ICU\n";
257259
}
258-
if ($self->{options}->{libedit})
259-
{
260-
print O "#define HAVE_EDITLINE_READLINE_H\n";
261-
print O "#define HAVE_LIBREADLINE\n";
262-
print O "#define HAVE_WIN32_LIBEDIT\n";
263-
print O "#define HAVE_RL_FILENAME_COMPLETION_FUNCTION\n";
264-
print O "#define HAVE_RL_COMPLETION_MATCHES\n";
265-
}
266260
if ($self->{options}->{zstd})
267261
{
268262
print O "#define CFS_COMPRESSION 6\n";
269263
}
264+
270265
print O "#define VAL_CONFIGURE \""
271266
. $self->GetFakeConfigure() . "\"\n";
272267
print O "#endif /* IGNORE_CONFIGURED_SETTINGS */\n";
@@ -773,7 +768,6 @@ sub new
773768
$self->{solutionFileVersion} = '10.00';
774769
$self->{vcver} = '9.00';
775770
$self->{visualStudioName} = 'Visual Studio 2008';
776-
777771
return $self;
778772
}
779773

@@ -797,6 +791,7 @@ sub new
797791
$self->{solutionFileVersion} = '11.00';
798792
$self->{vcver} = '10.00';
799793
$self->{visualStudioName} = 'Visual Studio 2010';
794+
$self->{have_stdint_h} = 1;
800795

801796
return $self;
802797
}
@@ -821,6 +816,7 @@ sub new
821816
$self->{solutionFileVersion} = '12.00';
822817
$self->{vcver} = '11.00';
823818
$self->{visualStudioName} = 'Visual Studio 2012';
819+
$self->{have_stdint_h} = 1;
824820

825821
return $self;
826822
}
@@ -847,6 +843,7 @@ sub new
847843
$self->{visualStudioName} = 'Visual Studio 2013';
848844
$self->{VisualStudioVersion} = '12.0.21005.1';
849845
$self->{MinimumVisualStudioVersion} = '10.0.40219.1';
846+
$self->{have_stdint_h} = 1;
850847

851848
return $self;
852849
}
@@ -873,6 +870,7 @@ sub new
873870
$self->{visualStudioName} = 'Visual Studio 2015';
874871
$self->{VisualStudioVersion} = '14.0.24730.2';
875872
$self->{MinimumVisualStudioVersion} = '10.0.40219.1';
873+
$self->{have_stdint_h} = 1;
876874

877875
return $self;
878876
}

0 commit comments

Comments
 (0)