Skip to content

[v636] Adapt to GCC 8 passing convention for string length #21022

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
guitargeek merged 3 commits into from
Jan 25, 2026
Merged

[v636] Adapt to GCC 8 passing convention for string length #21022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9797d7f
[h2root] Adapt to GCC 8 passing convention for string length
guitargeek Nov 26, 2025
778d0c6
[hbook] Adapt to GCC 8 passing convention for string length
ferdymercury Nov 26, 2025
e21329e
[h2root] Adapt to GCC 8 passing convention for string length
ferdymercury Dec 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 19 additions & 10 deletions hist/hbook/src/THbookFile.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,15 @@ static Int_t gLastEntry = -1;
# define type_of_call
# define DEFCHAR const char*
# define PASSCHAR(string) string

// As recommended in
// https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html
#if __GNUC__ > 7
typedef size_t fortran_charlen_t;
#else
typedef int fortran_charlen_t;
#endif

#else
# define hlimit HLIMIT
# define hldir HLDIR
Expand Down Expand Up @@ -177,8 +186,8 @@ static Int_t gLastEntry = -1;
extern "C" void type_of_call hlimit(const int&);
#ifndef WIN32
extern "C" void type_of_call hropen(const int&,DEFCHAR,DEFCHAR,DEFCHAR,
const int&,const int&,const int,const int,const int);
extern "C" void type_of_call hrend(DEFCHAR,const int);
const int&,const int&,fortran_charlen_t,fortran_charlen_t,fortran_charlen_t);
extern "C" void type_of_call hrend(DEFCHAR,fortran_charlen_t);
#else
extern "C" void type_of_call hropen(const int&,DEFCHAR,DEFCHAR,DEFCHAR,
const int&,const int&);
Expand All @@ -189,7 +198,7 @@ extern "C" void type_of_call hrin(const int&,const int&,const int&);
extern "C" void type_of_call hnoent(const int&,const int&);
#ifndef WIN32
extern "C" void type_of_call hgive(const int&,DEFCHAR,const int&,const float&,const float&,
const int&,const float&,const float&,const int&,const int&,const int);
const int&,const float&,const float&,const int&,const int&,fortran_charlen_t);
#else
extern "C" void type_of_call hgive(const int&,DEFCHAR,const int&,const float&,const float&,
const int&,const float&,const float&,const int&,const int&);
Expand All @@ -198,24 +207,24 @@ extern "C" void type_of_call hgive(const int&,DEFCHAR,const int&,const float&,c
//SUBROUTINE HGNT1(IDD,BLKNA1,VAR,IOFFST,NVAR,IDNEVT,IERROR)
#ifndef WIN32
extern "C" void type_of_call hgiven(const int&,DEFCHAR,const int&,DEFCHAR,
const float&,const float&,const int,const int);
extern "C" void type_of_call hgnt1(const int&,DEFCHAR,DEFCHAR,const int&,const int&,const int&,const int&,const int,const int);
const float&,const float&,fortran_charlen_t,fortran_charlen_t);
extern "C" void type_of_call hgnt1(const int&,DEFCHAR,DEFCHAR,const int&,const int&,const int&,const int&,fortran_charlen_t,fortran_charlen_t);
#else
extern "C" void type_of_call hgiven(const int&,DEFCHAR,const int&,DEFCHAR,
const float&,const float&);
extern "C" void type_of_call hgnt1(const int&,DEFCHAR,DEFCHAR,const int&,const int&,const int&,const int&);
#endif

#ifndef WIN32
extern "C" void type_of_call hntvar2(const int&,const int&,DEFCHAR,DEFCHAR,DEFCHAR,int&,int&,int&,int&,int&,const int,const int, const int);
extern "C" void type_of_call hntvar3(const int&,const int&,DEFCHAR, const int);
extern "C" void type_of_call hntvar2(const int&,const int&,DEFCHAR,DEFCHAR,DEFCHAR,int&,int&,int&,int&,int&,fortran_charlen_t,fortran_charlen_t, fortran_charlen_t);
extern "C" void type_of_call hntvar3(const int&,const int&,DEFCHAR, fortran_charlen_t);
#else
extern "C" void type_of_call hntvar2(const int&,const int&,DEFCHAR,DEFCHAR,DEFCHAR,int&,int&,int&,int&,int&);
extern "C" void type_of_call hntvar3(const int&,const int&,DEFCHAR);
#endif

#ifndef WIN32
extern "C" void type_of_call hbnam(const int&,DEFCHAR,const int&,DEFCHAR,const int&,const int, const int);
extern "C" void type_of_call hbnam(const int&,DEFCHAR,const int&,DEFCHAR,const int&,fortran_charlen_t, fortran_charlen_t);
#else
extern "C" void type_of_call hbnam(const int&,DEFCHAR,const int&,DEFCHAR,const int&);
#endif
Expand All @@ -237,8 +246,8 @@ extern "C" void type_of_call hix(const int&,const int&,const float&);
extern "C" void type_of_call hijxy(const int&,const int&,const int&,const float&,const float&);
extern "C" float type_of_call hije(const int&,const int&,const int&);
#ifndef WIN32
extern "C" void type_of_call hcdir(DEFCHAR,DEFCHAR ,const int,const int);
extern "C" void type_of_call hldir(DEFCHAR,DEFCHAR ,const int,const int);
extern "C" void type_of_call hcdir(DEFCHAR,DEFCHAR ,fortran_charlen_t,fortran_charlen_t);
extern "C" void type_of_call hldir(DEFCHAR,DEFCHAR ,fortran_charlen_t,fortran_charlen_t);
#else
extern "C" void type_of_call hcdir(DEFCHAR,DEFCHAR);
extern "C" void type_of_call hldir(DEFCHAR,DEFCHAR);
Expand Down
35 changes: 26 additions & 9 deletions main/src/h2root.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,15 @@ void MAIN__() {}
# define type_of_call
# define DEFCHAR const char*
# define PASSCHAR(string) string

// As recommended in
// https://gcc.gnu.org/onlinedocs/gfortran/Argument-passing-conventions.html
#if __GNUC__ > 7
typedef size_t fortran_charlen_t;
#else
typedef int fortran_charlen_t;
#endif

#else
# define hlimit HLIMIT
# define hropen HROPEN
Expand Down Expand Up @@ -169,7 +178,7 @@ void MAIN__() {}
extern "C" void type_of_call hlimit(const int&);
#ifndef WIN32
extern "C" void type_of_call hropen(const int&,DEFCHAR,DEFCHAR,DEFCHAR,
const int&,const int&,const int,const int,const int);
const int&,const int&,fortran_charlen_t,fortran_charlen_t,fortran_charlen_t);
#else
extern "C" void type_of_call hropen(const int&,DEFCHAR,DEFCHAR,DEFCHAR,
const int&,const int&);
Expand All @@ -179,37 +188,45 @@ extern "C" void type_of_call hrin(const int&,const int&,const int&);
extern "C" void type_of_call hnoent(const int&,const int&);
#ifndef WIN32
extern "C" void type_of_call hgive(const int&,DEFCHAR,const int&,const float&,const float&,
const int&,const float&,const float&,const int&,const int&,const int);
const int&,const float&,const float&,const int&,const int&,fortran_charlen_t);
#else
extern "C" void type_of_call hgive(const int&,DEFCHAR,const int&,const float&,const float&,
const int&,const float&,const float&,const int&,const int&);
#endif

#ifndef WIN32
extern "C" void type_of_call hgiven(const int&,DEFCHAR,const int&,DEFCHAR,
const float&,const float&,const int,const int);
const float&,const float&,fortran_charlen_t,fortran_charlen_t);
#else
extern "C" void type_of_call hgiven(const int&,DEFCHAR,const int&,DEFCHAR,
const float&,const float&);
#endif

#ifndef WIN32
extern "C" void type_of_call hntvar2(const int&,const int&,DEFCHAR,DEFCHAR,DEFCHAR,int&,int&,int&,int&,int&,const int,const int, const int);
extern "C" void type_of_call hntvar2(const int&,const int&,DEFCHAR,DEFCHAR,DEFCHAR,int&,int&,int&,int&,int&,fortran_charlen_t,fortran_charlen_t,fortran_charlen_t);
#else
extern "C" void type_of_call hntvar2(const int&,const int&,DEFCHAR,DEFCHAR,DEFCHAR,int&,int&,int&,int&,int&);
#endif

#ifndef WIN32
extern "C" void type_of_call hbnam(const int&,DEFCHAR,const int&,DEFCHAR,const int&,const int, const int);
extern "C" void type_of_call hbnam(const int&,DEFCHAR,const int&,DEFCHAR,const int&,fortran_charlen_t,fortran_charlen_t);
#else
extern "C" void type_of_call hbnam(const int&,DEFCHAR,const int&,DEFCHAR,const int&);
#endif

extern "C" void type_of_call hprntu(const int&);
extern "C" void type_of_call hgnpar(const int&,const char *,const int);
#ifndef WIN32
extern "C" void type_of_call hgnpar(const int&,DEFCHAR,fortran_charlen_t);
#else
extern "C" void type_of_call hgnpar(const int&,DEFCHAR);
#endif
extern "C" void type_of_call hgnf(const int&,const int&,const float&,const int&);
extern "C" void type_of_call hgnt(const int&,const int&,const int&);
extern "C" void type_of_call rzink(const int&,const int&,const char *,const int);
#ifndef WIN32
extern "C" void type_of_call rzink(const int&,const int&,DEFCHAR,fortran_charlen_t);
#else
extern "C" void type_of_call rzink(const int&,const int&,DEFCHAR);
#endif
extern "C" void type_of_call hdcofl();
extern "C" void type_of_call hmaxim(const int&,const float&);
extern "C" void type_of_call hminim(const int&,const float&);
Expand All @@ -232,14 +249,14 @@ extern "C" double type_of_call hije(const int&,const int&,const int&);
#endif

#ifndef WIN32
extern "C" void type_of_call hcdir(DEFCHAR,DEFCHAR ,const int,const int);
extern "C" void type_of_call hcdir(DEFCHAR,DEFCHAR ,fortran_charlen_t,fortran_charlen_t);
#else
extern "C" void type_of_call hcdir(DEFCHAR,DEFCHAR);
#endif

extern "C" void type_of_call zitoh(const int&,const int&,const int&);
#ifndef WIN32
extern "C" void type_of_call uhtoc(const int&,const int&,DEFCHAR,int&,const int);
extern "C" void type_of_call uhtoc(const int&,const int&,DEFCHAR,int&,fortran_charlen_t);
#else
extern "C" void type_of_call uhtoc(const int&,const int&,DEFCHAR,int&);
#endif
Expand Down
Loading