Commit7e2f8ed

committed

Fix compiling errors on Windows platform. Fix wrong usage of

INT64CONST macro. Fix lo_hton64 and lo_ntoh64 not to use int32_t anduint32_t.

1 parentb51a65f commit7e2f8edCopy full SHA for 7e2f8ed

File tree

-7

lines changed

-7

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ typedef struct LargeObjectDesc`
`65`	`65`	`/*`
`66`	`66`	`* Maximum byte length for each large object`
`67`	`67`	`*/`
`68`		`-#defineMAX_LARGE_OBJECT_SIZEINT64CONST(INT_MAX * LOBLKSIZE)`
	`68`	`+#defineMAX_LARGE_OBJECT_SIZE((int64)INT_MAX * LOBLKSIZE)`
`69`	`69`
`70`	`70`	`/*`
`71`	`71`	`* Function definitions...`

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -1046,13 +1046,13 @@ static pg_int64`
`1046`	`1046`	`lo_hton64(pg_int64host64)`
`1047`	`1047`	`{`
`1048`	`1048`	`pg_int64result;`
`1049`		`-uint32_th32,l32;`
	`1049`	`+uint32h32,l32;`
`1050`	`1050`
`1051`	`1051`	`/* High order half first, since we're doing MSB-first */`
`1052`		`-h32= (uint32_t) (host64 >>32);`
	`1052`	`+h32= (uint32) (host64 >>32);`
`1053`	`1053`
`1054`	`1054`	`/* Now the low order half */`
`1055`		`-l32= (uint32_t) (host64&0xffffffff);`
	`1055`	`+l32= (uint32) (host64&0xffffffff);`
`1056`	`1056`
`1057`	`1057`	`result=htonl(l32);`
`1058`	`1058`	`result <<=32;`
`@@ -1069,10 +1069,10 @@ static pg_int64`
`1069`	`1069`	`lo_ntoh64(pg_int64net64)`
`1070`	`1070`	`{`
`1071`	`1071`	`pg_int64result;`
`1072`		`-uint32_th32,l32;`
	`1072`	`+uint32h32,l32;`
`1073`	`1073`
`1074`		`-l32= (uint32_t) (net64 >>32);`
`1075`		`-h32= (uint32_t) (net64&0xffffffff);`
	`1074`	`+l32= (uint32) (net64 >>32);`
	`1075`	`+h32= (uint32) (net64&0xffffffff);`
`1076`	`1076`
`1077`	`1077`	`result=ntohl(h32);`
`1078`	`1078`	`result <<=32;`

Comments

(0)