1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85
|
Description: Fix FTBFS with gcc14
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2024-08-08
Forwarded: no
--- a/include/HdfEosDef.h
+++ b/include/HdfEosDef.h
@@ -290,7 +290,7 @@
/* EH Utility Prototypes */
int32 EHsizeof( int32 vdataID, const char *name);
float64 EHconvAng(float64, intn);
-int32 EHparsestr(char *, char, char *[], int32 []);
+int32 EHparsestr(const char *, char, char *[], int32 []);
int32 EHstrwithin(const char *, char *, char);
intn EHchkODL(char *);
intn EHloadliststr(char *[], int32, char *, char);
--- a/configure.ac
+++ b/configure.ac
@@ -305,6 +305,7 @@
AC_TRY_RUN(
[
#include <stddef.h>
+ #include <stdlib.h>
#include <szlib.h>
int main(void)
@@ -323,6 +324,7 @@
AC_TRY_RUN(
[
#include <stddef.h>
+ #include <stdlib.h>
#include <szlib.h>
int main(void)
@@ -424,6 +426,7 @@
[AC_LANG_PROGRAM(
[
#include <hdf.h>
+ #include <stdlib.h>
],[
comp_coder_t codertype = COMP_CODE_SZIP;
uint32 configinfo;
@@ -460,6 +463,7 @@
[AC_LANG_PROGRAM(
[
#include <hdf.h>
+ #include <stdlib.h>
],[
comp_coder_t codertype = COMP_CODE_SZIP;
uint32 configinfo;
--- a/include/fortran_api.h
+++ b/include/fortran_api.h
@@ -12,6 +12,7 @@
#define __FORTRAN_API_H__
#include <string.h>
+#include <stdlib.h>
/*
* These definitions control how the fortran function name is generated. One of
@@ -385,4 +386,4 @@
-#endif // __FORTRAN_API_H__
\ No newline at end of file
+#endif // __FORTRAN_API_H__
--- a/src/EHapi.c
+++ b/src/EHapi.c
@@ -977,7 +977,7 @@
| END_PROLOG |
-----------------------------------------------------------------------------*/
int32
-EHparsestr(char *instring, char delim, char *pntr[], int32 len[])
+EHparsestr(const char *instring, char delim, char *pntr[], int32 len[])
{
int32 i; /* Loop index */
int32 prevDelimPos = 0; /* Previous delimiter position */
@@ -3828,4 +3828,4 @@
FORTRAN_API_FN(FLOAT64, EHconvAng, EHCONVANG, ehconvang, FLOAT64, INT)
FORTRAN_API_FN(INT, EHHEisHE2, EHHEISHE2, ehheishe2, STRING)
FORTRAN_API_FN(INT, EHgetversion, EHGETVER, ehgetver, INT32, OUT STRING)
-#endif // FORTRAN_API
\ No newline at end of file
+#endif // FORTRAN_API
|