From c83137cf783c71130d29d614c60be6ec134a30da Mon Sep 17 00:00:00 2001
From: Salvatore Filippone <salvatore.filippone@uniroma2.it>
Date: Sat, 4 Jan 2025 09:40:30 +0100
Subject: [PATCH] Constants psb_sizeof_X should be 8 bytes

---
 base/modules/cutil.c           |  3 ++-
 base/modules/psb_const_mod.F90 | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/base/modules/cutil.c b/base/modules/cutil.c
index 503e14a5..7748d147 100644
--- a/base/modules/cutil.c
+++ b/base/modules/cutil.c
@@ -1,8 +1,9 @@
 #include <sys/time.h>
 #include <stdio.h>
 #include <string.h>
+#include <stdint.h>
 
-void psi_c_diffadd(void *p1, void *p2, int *ret)
+void psi_c_diffadd(void *p1, void *p2, int64_t *ret)
 {
   *ret = (int)((char *)p2-(char *)p1);
   return;
diff --git a/base/modules/psb_const_mod.F90 b/base/modules/psb_const_mod.F90
index 70631932..69f7cfa6 100644
--- a/base/modules/psb_const_mod.F90
+++ b/base/modules/psb_const_mod.F90
@@ -101,24 +101,24 @@ module psb_const_mod
   integer, parameter  :: psb_lpk_ = -1
 #endif
 
-  integer(psb_mpk_), save      :: psb_sizeof_sp
-  integer(psb_mpk_), save      :: psb_sizeof_dp
-  integer(psb_mpk_), save      :: psb_sizeof_i2p = 2
-  integer(psb_mpk_), save      :: psb_sizeof_mp  = 4
-  integer(psb_mpk_), save      :: psb_sizeof_ep  = 8
+  integer(psb_epk_), save      :: psb_sizeof_sp
+  integer(psb_epk_), save      :: psb_sizeof_dp
+  integer(psb_epk_), save      :: psb_sizeof_i2p = 2
+  integer(psb_epk_), save      :: psb_sizeof_mp  = 4
+  integer(psb_epk_), save      :: psb_sizeof_ep  = 8
 
 #if defined(IPK4) && defined(LPK4)
-  integer(psb_mpk_), save      :: psb_sizeof_ip = 4
-  integer(psb_mpk_), save      :: psb_sizeof_lp = 4
+  integer(psb_epk_), save      :: psb_sizeof_ip = 4
+  integer(psb_epk_), save      :: psb_sizeof_lp = 4
 #elif  defined(IPK4) && defined(LPK8)
-  integer(psb_mpk_), save      :: psb_sizeof_ip = 4
-  integer(psb_mpk_), save      :: psb_sizeof_lp = 8
+  integer(psb_epk_), save      :: psb_sizeof_ip = 4
+  integer(psb_epk_), save      :: psb_sizeof_lp = 8
 #elif  defined(IPK8) && defined(LPK8)
-  integer(psb_mpk_), save      :: psb_sizeof_ip = 8
-  integer(psb_mpk_), save      :: psb_sizeof_lp = 8
+  integer(psb_epk_), save      :: psb_sizeof_ip = 8
+  integer(psb_epk_), save      :: psb_sizeof_lp = 8
 #else
-  integer(psb_mpk_), save      :: psb_sizeof_ip = -1
-  integer(psb_mpk_), save      :: psb_sizeof_lp = -1
+  integer(psb_epk_), save      :: psb_sizeof_ip = -1
+  integer(psb_epk_), save      :: psb_sizeof_lp = -1
 #endif
 
   !