diff --git a/src/util/ga_accback.c b/src/util/ga_accback.c index 134b473cca..07ba7a2a4f 100644 --- a/src/util/ga_accback.c +++ b/src/util/ga_accback.c @@ -1,13 +1,9 @@ -#if (defined(CRAY) || defined(ARDENT) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(ARDENT) || defined(WIN32)) && !defined(__MINGW32__) # define ga_access_callback_release_ GA_ACCESS_CALLBACK_RELEASE #endif #include "ga.h" #include "macdecls.h" -#if defined(CRAY) -#define FATR -#include /* Required for Fortran-C string interface on Crays */ -#endif /* CRAY */ #ifdef WIN32 #include "typesf2c.h" #endif @@ -44,9 +40,9 @@ /*\ PROVIDE ACCESS TO A PATCH OF A GLOBAL ARRAY WITH CALLBACK AND RELEASE \*/ -void FATR ga_access_callback_release_(g_a, ilo, ihi, jlo, jhi, - callback, - arg1, arg2, arg3, arg4, arg5, arg6, arg7) +void ga_access_callback_release_(g_a, ilo, ihi, jlo, jhi, + callback, + arg1, arg2, arg3, arg4, arg5, arg6, arg7) Integer *g_a, *ilo, *ihi, *jlo, *jhi; Integer (*callback)(Integer *,Integer *,Integer *,Integer *,Integer *, void *, Integer*, @@ -79,7 +75,7 @@ void FATR ga_access_callback_release_(g_a, ilo, ihi, jlo, jhi, } } -void FATR nga_access_callback_release_(g_a, ilo, ihi, +void nga_access_callback_release_(g_a, ilo, ihi, callback, arg1, arg2, arg3, arg4, arg5, arg6, arg7) Integer *g_a, ilo[], ihi[]; diff --git a/src/util/md5/md5wrap.c b/src/util/md5/md5wrap.c index 4c8c39f138..5882f8842f 100644 --- a/src/util/md5/md5wrap.c +++ b/src/util/md5/md5wrap.c @@ -2,22 +2,15 @@ #include #include "mdglobal.h" #include "md5.h" -#if defined(CRAY) -#include -#endif #include "typesf2c.h" /* $Id$ */ -#if defined(USE_FCD) -extern int string_to_fortchar(_fcd f, int flen, char *buf); -#else extern int string_to_fortchar(char *f, int flen, char *buf); -#endif -#if (defined(CRAY) || defined(WIN32)) && !defined(__MINGW32__) +#if (defined(WIN32)) && !defined(__MINGW32__) #define checksum_simple_ CHECKSUM_SIMPLE #define checksum_init_ CHECKSUM_INIT #define checksum_update_ CHECKSUM_UPDATE @@ -169,17 +162,10 @@ requires a special interface for Fortran. \param len [Input] The number of characters in the string */ -#if defined(USE_FCD) -void FATR checksum_char_update_(_fcd f) -{ - checksum_update(_fcdlen(f), _fcdtocp(f)); -} -#else void FATR checksum_char_update_(const char *buf, int len) { checksum_update(len, buf); } -#endif /** \brief Fortran binding for `checksum_final` @@ -189,14 +175,8 @@ void FATR checksum_char_update_(const char *buf, int len) */ -#if defined(USE_FCD) -void FATR checksum_final_(_fcd f) -{ - int flen = _fcdlen(f); -#else void FATR checksum_final_(char *f, int flen) { -#endif char tmp[33]; checksum_final(tmp); @@ -218,21 +198,12 @@ Fortran compared to C. Hence a special function is needed for that data type. \param f [Output] The checksum */ -#if defined(USE_FCD) -void checksum_simple_(integer *len, const void *buf, _fcd f) -{ - checksum_init(); - checksum_update((int) *len, buf); - checksum_final_(f); -} -#else void checksum_simple_(integer *len, const void *buf, char *f, int flen) { checksum_init(); checksum_update((int) *len, buf); checksum_final_(f, flen); } -#endif /** \brief The Fortran binding for `checksum_simple` for character strings @@ -245,21 +216,12 @@ Fortran compared to C. Hence a special function is needed for that data type. \param f [Output] The checksum */ -#if defined(USE_FCD) -void checksum_char_simple_(_fcd b, _fcd f) -{ - checksum_init(); - checksum_char_update_(b); - checksum_final_(f); -} -#else void checksum_char_simple_(const char *buf, char *sum, int blen, int slen) { checksum_init(); checksum_char_update_(buf, blen); checksum_final_(sum, slen); } -#endif #ifdef MD5TEST int cmain() @@ -279,31 +241,15 @@ int cmain() /* Normally defined by NWChem */ -#if defined(USE_FCD) -static int string_to_fortchar(_fcd f, int flen, char *buf) -#else static int string_to_fortchar(char *f, int flen, char *buf) -#endif { int len = (int) strlen(buf), i; -#if defined(USE_FCD) - flen = _fcdlen(f); -#endif - if (len > flen) - return 0; /* Won't fit */ + if (len > flen) return 0; /* Won't fit */ + + for (i=0; i