File casacore-mirlib-gcc14-compat.patch of Package casacore

Overview Repositories Revisions Requests Users Attributes Meta

File casacore-mirlib-gcc14-compat.patch of Package casacore

From bfe4051a266c892ffc82225f51a525b6002f151d Mon Sep 17 00:00:00 2001
From: Darrell Schiebel <darrell@schiebel.us>
Date: Thu, 9 May 2024 15:32:03 -0400
Subject: [PATCH] Resolve issues compiling mirlib with gcc 14 (fixes #1344)

---
 mirlib/uvio.c | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/mirlib/uvio.c b/mirlib/uvio.c
index 0c8f930f18a..fa5a997f95f 100644
--- a/mirlib/uvio.c
+++ b/mirlib/uvio.c
@@ -370,6 +370,20 @@
 
 #define MYABS(x) ( (x) > 0 ? (x) : -(x) )
 
+/**************************************************************************
+*** GCC 14 detects problematic pointer passing:
+***
+***    In file included from casacore/mirlib/uvio.c:288:
+***    casacore/mirlib/miriad.h:182:51: note: expected ‘int8 *’ {aka ‘long long int *’} but argument is of type ‘off_t *’ {aka ‘long int *’}
+***    182 | void rdhdl_c (int tno, Const char *keyword, int8 *value, int8 defval);
+***        |                                             ~~~~~~^~~~~
+***
+***************************************************************************/
+#define RDHDL_C( TNO, KEYWORD, VALUE, DEFVAL ) \
+    { int8 value;                              \
+      rdhdl_c( TNO, KEYWORD, &value, DEFVAL);  \
+      *VALUE = value; }
+
 /*----------------------------------------------------------------------*/
 /*									*/
 /*	Types and static variables.					*/
@@ -746,7 +760,7 @@ void uvopen_c(int *tno,Const char *name,Const char *status)
 #ifdef MIR4
     /* figure out if to read old MIR3 or new MIR4 */
 #if true
-      rdhdl_c(*tno,"vislen",&(uv->max_offset),hsize_c(uv->item));
+      RDHDL_C(*tno,"vislen",&(uv->max_offset),hsize_c(uv->item));
 #else
       int old_vislen;
       rdhdi_c(*tno,"vislen",&old_vislen,hsize_c(uv->item));
@@ -791,7 +805,7 @@ void uvopen_c(int *tno,Const char *name,Const char *status)
 #ifdef MIR4
     /* figure out if to read old MIR3 or new MIR4 */
     if (1) {
-      rdhdl_c(*tno,"vislen",&(uv->offset),hsize_c(uv->item));
+      RDHDL_C(*tno,"vislen",&(uv->offset),hsize_c(uv->item));
     } else {
       int old_vislen;
       rdhdi_c(*tno,"vislen",&old_vislen,hsize_c(uv->item));
@@ -811,8 +825,8 @@ void uvopen_c(int *tno,Const char *name,Const char *status)
     rdhda_c(*tno,"obstype",line,"",MAXLINE);
     if(!strcmp(line,"autocorrelation"))		uv->flags |= UVF_AUTO;
     else if(!strcmp(line,"crosscorrelation"))	uv->flags |= UVF_CROSS;
-    rdhdl_c(*tno,"ncorr",&(uv->corr_flags.offset),-1);
-    rdhdl_c(*tno,"nwcorr",&(uv->wcorr_flags.offset),-1);
+    RDHDL_C(*tno,"ncorr",&(uv->corr_flags.offset),-1);
+    RDHDL_C(*tno,"nwcorr",&(uv->wcorr_flags.offset),-1);
     if(uv->corr_flags.offset < 0 || uv->wcorr_flags.offset < 0)
       BUG('f',"Cannot append to uv file without 'ncorr' and/or 'nwcorr' items");

Places

File casacore-mirlib-gcc14-compat.patch of Package casacore

Places