diff --git a/fortran/fortranCtypes/sizes.c b/fortran/fortranCtypes/sizes.c index 913437fb6..63f4e5ba8 100644 --- a/fortran/fortranCtypes/sizes.c +++ b/fortran/fortranCtypes/sizes.c @@ -5,41 +5,40 @@ void grib_check_fortran_char(char* a) { *a='f'; } void grib_check_fortran_char_(char* a) {grib_check_fortran_char(a);} -void grib_check_fortran_char__(char* a) {grib_check_fortran_char(a);} + void check_double(double *x,double *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_double_(double *x,double *y,char* ret) {check_double(x,y,ret);} -void check_double__(double *x,double *y,char* ret) {check_double(x,y,ret);} + void check_float(float *x,float *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_float_(float *x,float *y,char* ret) { check_float(x,y,ret); } -void check_float__(float *x,float *y,char* ret) { check_float(x,y,ret); } + void check_int(int *x,int *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_int_(int *x,int *y,char* ret) { check_int(x,y,ret); } -void check_int__(int *x,int *y,char* ret) { check_int(x,y,ret); } + void check_long(long *x,long *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_long_(long *x,long *y,char* ret) {check_long(x,y,ret);} -void check_long__(long *x,long *y,char* ret) {check_long(x,y,ret);} + void check_size_t(size_t *x,size_t *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_size_t_(size_t *x,size_t *y,char* ret) {check_size_t(x,y,ret);} -void check_size_t__(size_t *x,size_t *y,char* ret) {check_size_t(x,y,ret);} + void check_long_long(long long *x,long long *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_long_long_(long long *x,long long *y,char* ret) {check_long_long(x,y,ret);} -void check_long_long__(long long *x,long long *y,char* ret) {check_long_long(x,y,ret);} diff --git a/fortran/grib_fortran_kinds.c b/fortran/grib_fortran_kinds.c index 413a0d164..485194455 100644 --- a/fortran/grib_fortran_kinds.c +++ b/fortran/grib_fortran_kinds.c @@ -14,45 +14,41 @@ extern "C" { #endif -void f_sizeof(void *x,void *y, int *size) { - *size=((char*)y)-((char*)x); -} + void f_sizeof_(void *x,void *y, int *size) { *size=((char*)y)-((char*)x); } -void f_sizeof__(void *x,void *y, int *size) { - *size=((char*)y)-((char*)x); -} + void check_double(double *x,double *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_double_(double *x,double *y,char* ret) {check_double(x,y,ret);} -void check_double__(double *x,double *y,char* ret) {check_double(x,y,ret);} + void check_float(float *x,float *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_float_(float *x,float *y,char* ret) { check_float(x,y,ret); } -void check_float__(float *x,float *y,char* ret) { check_float(x,y,ret); } + void check_int(int *x,int *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_int_(int *x,int *y,char* ret) { check_int(x,y,ret); } -void check_int__(int *x,int *y,char* ret) { check_int(x,y,ret); } + void check_long(long *x,long *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_long_(long *x,long *y,char* ret) {check_long(x,y,ret);} -void check_long__(long *x,long *y,char* ret) {check_long(x,y,ret);} + void check_size_t(size_t *x,size_t *y,char* ret) { *ret = ((char*)y)-((char*)x) == sizeof(*x) ? 't' : 'f'; } void check_size_t_(size_t *x,size_t *y,char* ret) {check_size_t(x,y,ret);} -void check_size_t__(size_t *x,size_t *y,char* ret) {check_size_t(x,y,ret);} + #ifdef __cplusplus }