NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit7748e24

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 parent81a3d74 commit7748e24Copy full SHA for 7748e24

File tree

1 file changed

-10

lines changed

src/tools/msvc
- Solution.pm

1 file changed

-10

lines changed

`‎src/tools/msvc/Solution.pm`

Lines changed: 8 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,8 @@ sub _new`
`23`	`23`	`VisualStudioVersion=>undef,`
`24`	`24`	`MinimumVisualStudioVersion=>undef,`
`25`	`25`	`vcver=>undef,`
`26`		`-platform=>undef, };`
	`26`	`+platform=>undef,`
	`27`	`+have_stdint_h=> 0};`
`27`	`28`	`bless($self,$classname);`
`28`	`29`
`29`	`30`	`$self->DeterminePlatform();`
`@@ -172,6 +173,7 @@ sub GenerateFiles`
`172`	`173`	`s{#define PGPRO_VERSION_STR "[^"]+"}{#define PGPRO_VERSION_STR PGPRO_PACKAGE_STR " compiled by Visual C++ build" __STRINGIFY2(_MSC_VER) ",$bits-bit"};`
`173`	`174`	`print O;`
`174`	`175`	`}`
	`176`	`+print O"#define HAVE_STDINT_H\n"if$self->{have_stdint_h};`
`175`	`177`	`print O"#define PG_MAJORVERSION\"$self->{majorver}\"\n";`
`176`	`178`	`print O"#define LOCALEDIR\"/share/locale\"\n"`
`177`	`179`	`if ($self->{options}->{nls});`
`@@ -255,18 +257,11 @@ sub GenerateFiles`
`255`	`257`	`{`
`256`	`258`	`print O"#define USE_ICU\n";`
`257`	`259`	`}`
`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`		`-}`
`266`	`260`	`if ($self->{options}->{zstd})`
`267`	`261`	`{`
`268`	`262`	`print O"#define CFS_COMPRESSION 6\n";`
`269`	`263`	`}`
	`264`	`+`
`270`	`265`	`print O"#define VAL_CONFIGURE\""`
`271`	`266`	`.$self->GetFakeConfigure() ."\"\n";`
`272`	`267`	`print O"#endif /* IGNORE_CONFIGURED_SETTINGS */\n";`
`@@ -773,7 +768,6 @@ sub new`
`773`	`768`	`$self->{solutionFileVersion} ='10.00';`
`774`	`769`	`$self->{vcver} ='9.00';`
`775`	`770`	`$self->{visualStudioName} ='Visual Studio 2008';`
`776`		`-`
`777`	`771`	`return$self;`
`778`	`772`	`}`
`779`	`773`
`@@ -797,6 +791,7 @@ sub new`
`797`	`791`	`$self->{solutionFileVersion} ='11.00';`
`798`	`792`	`$self->{vcver} ='10.00';`
`799`	`793`	`$self->{visualStudioName} ='Visual Studio 2010';`
	`794`	`+$self->{have_stdint_h} = 1;`
`800`	`795`
`801`	`796`	`return$self;`
`802`	`797`	`}`
`@@ -821,6 +816,7 @@ sub new`
`821`	`816`	`$self->{solutionFileVersion} ='12.00';`
`822`	`817`	`$self->{vcver} ='11.00';`
`823`	`818`	`$self->{visualStudioName} ='Visual Studio 2012';`
	`819`	`+$self->{have_stdint_h} = 1;`
`824`	`820`
`825`	`821`	`return$self;`
`826`	`822`	`}`
`@@ -847,6 +843,7 @@ sub new`
`847`	`843`	`$self->{visualStudioName} ='Visual Studio 2013';`
`848`	`844`	`$self->{VisualStudioVersion} ='12.0.21005.1';`
`849`	`845`	`$self->{MinimumVisualStudioVersion} ='10.0.40219.1';`
	`846`	`+$self->{have_stdint_h} = 1;`
`850`	`847`
`851`	`848`	`return$self;`
`852`	`849`	`}`
`@@ -873,6 +870,7 @@ sub new`
`873`	`870`	`$self->{visualStudioName} ='Visual Studio 2015';`
`874`	`871`	`$self->{VisualStudioVersion} ='14.0.24730.2';`
`875`	`872`	`$self->{MinimumVisualStudioVersion} ='10.0.40219.1';`
	`873`	`+$self->{have_stdint_h} = 1;`
`876`	`874`
`877`	`875`	`return$self;`
`878`	`876`	`}`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit7748e24

File tree

1 file changed

1 file changed

`‎src/tools/msvc/Solution.pm`

0 commit comments