diff -c old-cfortran.h cfortran.h *** old-cfortran.h Mon May 2 17:17:12 2005 --- cfortran.h Mon May 2 16:48:45 2005 *************** *** 84,90 **** /* VAX/VMS does not let us \-split long #if lines. */ /* Split #if into 2 because some HP-UX can't handle long #if */ #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(PATHSCALE_COMPILER)) ! #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If no Fortran compiler is given, we choose one for the machines we know. */ #if defined(lynx) || defined(VAXUltrix) #define f2cFortran /* Lynx: Only support f2c at the moment. --- 84,90 ---- /* VAX/VMS does not let us \-split long #if lines. */ /* Split #if into 2 because some HP-UX can't handle long #if */ #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(PATHSCALE_COMPILER)) ! #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)||defined(INTEL_COMPILER)) /* If no Fortran compiler is given, we choose one for the machines we know. */ #if defined(lynx) || defined(VAXUltrix) #define f2cFortran /* Lynx: Only support f2c at the moment. *************** *** 128,139 **** #if defined(__PATHCC__) #define PATHSCALE_COMPILER #endif #endif /* ...Fortran */ #endif /* ...Fortran */ /* Split #if into 2 because some HP-UX can't handle long #if */ #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(PATHSCALE_COMPILER)) ! #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ --- 128,142 ---- #if defined(__PATHCC__) #define PATHSCALE_COMPILER #endif + #if defined(__INTEL_COMPILER) + #define INTEL_COMPILER + #endif #endif /* ...Fortran */ #endif /* ...Fortran */ /* Split #if into 2 because some HP-UX can't handle long #if */ #if !(defined(NAGf90Fortran)||defined(f2cFortran)||defined(hpuxFortran)||defined(apolloFortran)||defined(sunFortran)||defined(IBMR2Fortran)||defined(CRAYFortran)||defined(PATHSCALE_COMPILER)) ! #if !(defined(mipsFortran)||defined(DECFortran)||defined(vmsFortran)||defined(CONVEXFortran)||defined(PowerStationFortran)||defined(AbsoftUNIXFortran)||defined(AbsoftProFortran)||defined(SXFortran)||defined(INTEL_COMPILER)) /* If your compiler barfs on ' #error', replace # with the trigraph for # */ #error "cfortran.h: Can't find your environment among:\ - MIPS cc and f77 2.0. (e.g. Silicon Graphics, DECstations, ...) \ *************** *** 157,163 **** - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ - Portland Group Fortran: Use #define pgiFortran \ ! - PathScale Fortran: Use #define PATHSCALE_COMPILER" /* Compiler must throw us out at this point! */ #endif #endif --- 160,167 ---- - Absoft UNIX F77: Use #define AbsoftUNIXFortran or cc -DAbsoftUNIXFortran \ - Absoft Pro Fortran: Use #define AbsoftProFortran \ - Portland Group Fortran: Use #define pgiFortran \ ! - PathScale Fortran: Use #define PATHSCALE_COMPILER \ ! - Intel Fortran: Use #define INTEL_COMPILER" /* Compiler must throw us out at this point! */ #endif #endif *************** *** 170,176 **** /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ ! #if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(extname) || defined(PATHSCALE_COMPILER) #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else --- 174,180 ---- /* Throughout cfortran.h we use: UN = Uppercase Name. LN = Lowercase Name. */ ! #if defined(f2cFortran) || defined(NAGf90Fortran) || defined(DECFortran) || defined(mipsFortran) || defined(apolloFortran) || defined(sunFortran) || defined(CONVEXFortran) || defined(SXFortran) || defined(extname) || defined(PATHSCALE_COMPILER) || defined(INTEL_COMPILER) #define CFC_(UN,LN) _(LN,_) /* Lowercase FORTRAN symbols. */ #define orig_fcallsc(UN,LN) CFC_(UN,LN) #else *************** *** 349,358 **** [DECFortran for Ultrix RISC is also called f77 but is the same as VAX/VMS.] [MIPS f77 treats .eqv./.neqv. as .eq./.ne. and hence requires LOGICAL_STRICT.]*/ ! #if defined(NAGf90Fortran) || defined(f2cFortran) || defined(mipsFortran) || defined(PowerStationFortran) || defined(hpuxFortran800) || defined(AbsoftUNIXFortran) || defined(AbsoftProFortran) || defined(SXFortran) || defined(PATHSCALE_COMPILER) /* SX/PowerStationFortran have 0 and 1 defined, others are neither T nor F. */ /* hpuxFortran800 has 0 and 0x01000000 defined. Others are unknown. */ #define LOGICAL_STRICT /* Other Fortran have .eqv./.neqv. == .eq./.ne. */ #endif #define C2FLOGICALV(A,I) \ --- 353,366 ---- [DECFortran for Ultrix RISC is also called f77 but is the same as VAX/VMS.] [MIPS f77 treats .eqv./.neqv. as .eq./.ne. and hence requires LOGICAL_STRICT.]*/ ! #if defined(NAGf90Fortran)||defined(f2cFortran)||defined(mipsFortran)||defined(PowerStationFortran) ! #if defined(hpuxFortran800) || defined(AbsoftUNIXFortran) || defined(AbsoftProFortran) ! #if defined(SXFortran) || defined(PATHSCALE_COMPILER) || defined(INTEL_COMPILER) /* SX/PowerStationFortran have 0 and 1 defined, others are neither T nor F. */ /* hpuxFortran800 has 0 and 0x01000000 defined. Others are unknown. */ #define LOGICAL_STRICT /* Other Fortran have .eqv./.neqv. == .eq./.ne. */ + #endif + #endif #endif #define C2FLOGICALV(A,I) \