postgresql, fixes for 32bit (#10991)

This commit is contained in:
Schrijvers Luc
2024-08-30 18:08:21 +02:00
committed by GitHub
parent 1f1ab7c7d5
commit a3ae526a75
2 changed files with 77 additions and 12 deletions

View File

@@ -1,4 +1,4 @@
From f6614de28c3d72e841fe264fb186d055e43ee5fd Mon Sep 17 00:00:00 2001
From 3d1a59353acd602eb503375b1967d4f33e2fb14c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 24 Dec 2018 17:42:35 +0100
Subject: Applied patches
@@ -575,10 +575,10 @@ diff --git a/src/template/haiku b/src/template/haiku
new file mode 100644
index 0000000..e69de29
--
2.37.3
2.45.2
From 4cf41446adbc8e6b216f2e2a6a3d7a4b34819d89 Mon Sep 17 00:00:00 2001
From 9c1faac3aa2df642bec32b1304795dfbd8cdae37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Mon, 24 Dec 2018 18:19:05 +0100
Subject: Build fix
@@ -599,10 +599,10 @@ index b505e2a..f782c33 100644
if (pgwin32_is_admin())
{
--
2.37.3
2.45.2
From 6d33a10454983097e4da017f3aa3db6db88dce2b Mon Sep 17 00:00:00 2001
From 62b75ceacfb219f30350aea70edefc747784032e Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 26 Dec 2022 17:34:07 +0100
Subject: adjust autoconf required version
@@ -622,5 +622,37 @@ index b19e7d7..8a816e9 100644
recommended. You can remove the check from 'configure.in' but it is then
your responsibility whether the result works or not.])])
--
2.37.3
2.45.2
From 96c83b88f25a4a740f9bd0b29cd0f3c6ac45adea Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 30 Aug 2024 17:53:28 +0200
Subject: Fix 32bit build
diff --git a/src/include/c.h b/src/include/c.h
index 702087d..0744aea 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -312,6 +312,9 @@ typedef char *Pointer;
* used for numerical computations and the
* frontend/backend protocol.
*/
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#else
#ifndef HAVE_INT8
typedef signed char int8; /* == 8 bits */
typedef signed short int16; /* == 16 bits */
@@ -329,6 +332,7 @@ typedef unsigned char uint8; /* == 8 bits */
typedef unsigned short uint16; /* == 16 bits */
typedef unsigned int uint32; /* == 32 bits */
#endif /* not HAVE_UINT8 */
+#endif
/*
* bitsN
--
2.45.2

View File

@@ -1,4 +1,4 @@
From 09752f6b9cf2826ffca43c23fc514741b6f483b0 Mon Sep 17 00:00:00 2001
From 135d7a10f83d336a27d5a1588f9ab5d90b07028b Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Thu, 3 Oct 2019 17:36:43 +0000
Subject: Changes to make Postgresql run on Haiku.
@@ -575,10 +575,10 @@ diff --git a/src/template/haiku b/src/template/haiku
new file mode 100644
index 0000000..e69de29
--
2.42.1
2.45.2
From 77c3db3ae32428f2f81813585c3b20dc431a5aaf Mon Sep 17 00:00:00 2001
From 935cf953e151add708ad32a2f3074cc721ed65c7 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Mon, 26 Dec 2022 17:35:12 +0100
Subject: adjust autoconf required version
@@ -598,10 +598,10 @@ index 339db16..f9339f5 100644
recommended. You can remove the check from 'configure.in' but it is then
your responsibility whether the result works or not.])])
--
2.42.1
2.45.2
From 9f6e8b6f09b591b0d7d3bdd92618831edc2ca97a Mon Sep 17 00:00:00 2001
From 047de666b5dd5353f46ff5bb5d097f5cac7fbf92 Mon Sep 17 00:00:00 2001
From: Begasus <begasus@gmail.com>
Date: Fri, 9 Feb 2024 16:23:14 +0100
Subject: Fix build with newer ldap (from upstream)
@@ -640,5 +640,38 @@ index f9339f5..af3fc1d 100644
fi
AC_CHECK_FUNCS([ldap_initialize])
--
2.42.1
2.45.2
From 46227773c186d562b9e478ff7de21227990e39e5 Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Fri, 30 Aug 2024 17:54:01 +0200
Subject: Fix 32bit build
diff --git a/src/include/c.h b/src/include/c.h
index 586b10a..7a1aef3 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -345,6 +345,9 @@ typedef char *Pointer;
* used for numerical computations and the
* frontend/backend protocol.
*/
+#ifdef __HAIKU__
+#include <SupportDefs.h>
+#else
#ifndef HAVE_INT8
typedef signed char int8; /* == 8 bits */
typedef signed short int16; /* == 16 bits */
@@ -362,7 +365,7 @@ typedef unsigned char uint8; /* == 8 bits */
typedef unsigned short uint16; /* == 16 bits */
typedef unsigned int uint32; /* == 32 bits */
#endif /* not HAVE_UINT8 */
-
+#endif
/*
* bitsN
* Unit of bitwise operation, AT LEAST N BITS IN SIZE.
--
2.45.2