Commita31b03b

committed

Clean up float4byval and float8byval handling by dealing with them completely

from inside the build script.

1 parentbe9ab11 commita31b03bCopy full SHA for a31b03b

File tree

+12

-22

lines changed

+12

-22

lines changed

Lines changed: 0 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,6 @@`
`53`	`53`	`(--enable-thread-safety) */`
`54`	`54`	`#define ENABLE_THREAD_SAFETY 1`
`55`	`55`
`56`		`-/* float4 values are passed by value if 'true', by reference if 'false' */`
`57`		`-#define FLOAT4PASSBYVAL true`
`58`		`-`
`59`		`-/* float8, int8, and related values are passed by value if 'true', by`
`60`		`- reference if 'false' */`
`61`		`-#define FLOAT8PASSBYVAL false`
`62`		`-`
`63`	`56`	`/* Define to 1 if getpwuid_r() takes a 5th argument. */`
`64`	`57`	`/* #undef GETPWUID_R_5ARG */`
`65`	`58`
`@@ -623,14 +616,6 @@`
`623`	`616`	`/* Define to 1 to build with Bonjour support. (--with-bonjour) */`
`624`	`617`	`/* #undef USE_BONJOUR */`
`625`	`618`
`626`		`-/* Define to 1 if you want float4 values to be passed by value.`
`627`		`- (--enable-float4-byval) */`
`628`		`-#define USE_FLOAT4_BYVAL 1`
`629`		`-`
`630`		`-/* Define to 1 if you want float8, int8, etc values to be passed by value.`
`631`		`- (--enable-float8-byval) */`
`632`		`-/* #undef USE_FLOAT8_BYVAL */`
`633`		`-`
`634`	`619`	`/* Define to 1 if you want 64-bit integer timestamp and interval support.`
`635`	`620`	`(--enable-integer-datetimes) */`
`636`	`621`	`/* #undef USE_INTEGER_DATETIMES */`

Lines changed: 12 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Solution;`
`3`	`3`	`#`
`4`	`4`	`# Package that encapsulates a Visual C++ solution file generation`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.39 2008/04/2110:01:32 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Solution.pm,v 1.40 2008/04/2118:37:28 mha Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use strict;`
`@@ -118,19 +118,24 @@ s{PG_VERSION_STR "[^"]+"}{__STRINGIFY(x) #x\n#define __STRINGIFY2(z) __STRINGIFY`
`118`	`118`	`print O"#define USE_SSL 1\n"if ($self->{options}->{openssl});`
`119`	`119`	`print O"#define ENABLE_NLS 1\n"if ($self->{options}->{nls});`
`120`	`120`
`121`		`-unless ($self->{options}->{float4byval})`
	`121`	`+if ($self->{options}->{float4byval})`
	`122`	`+ {`
	`123`	`+print O"#define USE_FLOAT4_BYVAL 1\n";`
	`124`	`+print O"#define FLOAT4PASSBYVAL true\n";`
	`125`	`+ }`
	`126`	`+else`
`122`	`127`	`{`
`123`		`-# float4byval is the default, so undefine`
`124`		`-print O"#undef USE_FLOAT4_BYVAL\n";`
`125`		`-print O"#undef FLOAT4PASSBYVAL\n";`
`126`	`128`	`print O"#define FLOAT4PASSBYVAL false\n";`
`127`	`129`	`}`
`128`	`130`	`if ($self->{options}->{float8byval})`
`129`	`131`	`{`
`130`		`-print O"#define USE_FLOAT8_BYVAL\n";`
`131`		`-print O"#undef FLOAT8PASSBYVAL\n";`
	`132`	`+print O"#define USE_FLOAT8_BYVAL 1\n";`
`132`	`133`	`print O"#define FLOAT8PASSBYVAL true\n";`
`133`	`134`	`}`
	`135`	`+else`
	`136`	`+ {`
	`137`	`+print O"#define FLOAT8PASSBYVAL false\n";`
	`138`	`+ }`
`134`	`139`
`135`	`140`	`if ($self->{options}->{uuid})`
`136`	`141`	`{`

Comments

(0)