From 7e2f8ed2b0dcff052b8f06069e2d69f02b774f04 Mon Sep 17 00:00:00 2001
From: Tatsuo Ishii <ishii@postgresql.org>
Date: Sun, 7 Oct 2012 23:30:31 +0900
Subject: [PATCH] Fix compiling errors on Windows platform. Fix wrong usage of
INT64CONST macro. Fix lo_hton64 and lo_ntoh64 not to use int32_t and
uint32_t.
---
src/include/storage/large_object.h | 2 +-
src/interfaces/libpq/fe-lobj.c | 12 ++++++------
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index 52f01c6e3c3..715f0c3bc49 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -65,7 +65,7 @@ typedef struct LargeObjectDesc
/*
* Maximum byte length for each large object
*/
-#define MAX_LARGE_OBJECT_SIZE INT64CONST(INT_MAX * LOBLKSIZE)
+#define MAX_LARGE_OBJECT_SIZE ((int64)INT_MAX * LOBLKSIZE)
/*
* Function definitions...
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index fb17ac8b1e9..022cfec0932 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -1046,13 +1046,13 @@ static pg_int64
lo_hton64(pg_int64 host64)
{
pg_int64 result;
- uint32_t h32, l32;
+ uint32 h32, l32;
/* High order half first, since we're doing MSB-first */
- h32 = (uint32_t) (host64 >> 32);
+ h32 = (uint32) (host64 >> 32);
/* Now the low order half */
- l32 = (uint32_t) (host64 & 0xffffffff);
+ l32 = (uint32) (host64 & 0xffffffff);
result = htonl(l32);
result <<= 32;
@@ -1069,10 +1069,10 @@ static pg_int64
lo_ntoh64(pg_int64 net64)
{
pg_int64 result;
- uint32_t h32, l32;
+ uint32 h32, l32;
- l32 = (uint32_t) (net64 >> 32);
- h32 = (uint32_t) (net64 & 0xffffffff);
+ l32 = (uint32) (net64 >> 32);
+ h32 = (uint32) (net64 & 0xffffffff);
result = ntohl(h32);
result <<= 32;
--
GitLab