removed f2c.h

2 files changed, 40 insertions, 285 deletions

diff --git a/lib/Numeric/LinearAlgebra/LAPACK/f2c.h b/lib/Numeric/LinearAlgebra/LAPACK/f2c.h
deleted file mode 100644
index 6a07e09..0000000
--- a/lib/Numeric/LinearAlgebra/LAPACK/f2c.h
+++ /dev/null
@@ -1,284 +0,0 @@
-/* f2c.h  --  Standard Fortran to C header file */
-
-/**  barf  [ba:rf]  2.  "He suggested using FORTRAN, and everybody barfed."
-
-        - From The Shogakukan DICTIONARY OF NEW ENGLISH (Second edition) */
-
-#ifndef F2C_INCLUDE
-#define F2C_INCLUDE
-
-/*
-
-Extracted from http://opengrok.creo.hu/dragonfly/xref/src/contrib/gcc-3.4/libf2c/readme.netlib
-
-NOTE:   f2c.h defines several types, e.g., real, integer, doublereal.
-    115         The definitions in f2c.h are suitable for most machines, but if
-    116         your machine has sizeof(double) > 2*sizeof(long), you may need
-    117         to adjust f2c.h appropriately.  f2c assumes
-    118                 sizeof(doublecomplex) = 2*sizeof(doublereal)
-    119                 sizeof(doublereal) = sizeof(complex)
-    120                 sizeof(doublereal) = 2*sizeof(real)
-    121                 sizeof(real) = sizeof(integer)
-    122                 sizeof(real) = sizeof(logical)
-    123                 sizeof(real) = 2*sizeof(shortint)
-    124         EQUIVALENCEs may not be translated correctly if these
-    125         assumptions are violated.
-    126 
-    127         On machines, such as those using a DEC Alpha processor, on
-    128         which sizeof(short) == 2, sizeof(int) == sizeof(float) == 4,
-    129         and sizeof(long) == sizeof(double) == 8, it suffices to
-    130         modify f2c.h by removing the first occurrence of "long "
-    131         on each line containing "long ", e.g., by issuing the
-    132         commands
-    133                 mv f2c.h f2c.h0
-    134                 sed 's/long //' f2c.h0 >f2c.h
-    135         On such machines, one can enable INTEGER*8 by uncommenting
-    136         the typedef of longint in f2c.h, so it reads
-    137                 typedef long longint;
-    138         by compiling libI77 with -DAllow_TYQUAD, and by adjusting
-    139         libF77/makefile as described in libF77/README.
-    140 
-    141         Some machines may have sizeof(int) == 4, sizeof(float) == 8,
-    142         and sizeof(long long) == 8.  On such machines, adjust f2c.h
-    143         by changing "long int " to "long long ", e.g., by saying
-    144                 mv f2c.h f2c.h0
-    145                 sed 's/long int /long long /' f2c.h0 >f2c.h
-    146         One can enable INTEGER*8 on such machines as described
-    147         above, but with
-    148                 typedef long long longint;
-
-I thing that the following definitions are correct:
-
-*/
-
-#ifdef _LP64
-typedef int integer;
-typedef unsigned int uinteger;
-typedef int logical;
-typedef long longint;           /* system-dependent */
-typedef unsigned long ulongint; /* system-dependent */
-#else
-typedef long int integer;
-typedef unsigned long int uinteger;
-typedef long int logical;
-typedef long long longint;              /* system-dependent */
-typedef unsigned long long ulongint;    /* system-dependent */
-#endif
-
-typedef char *address;
-typedef short int shortint;
-typedef float real;
-typedef double doublereal;
-typedef struct { real r, i; } complex;
-typedef struct { doublereal r, i; } doublecomplex;
-typedef short int shortlogical;
-typedef char logical1;
-typedef char integer1;
-#ifdef INTEGER_STAR_8   /* Adjust for integer*8. */
-#define qbit_clear(a,b) ((a) & ~((ulongint)1 << (b)))
-#define qbit_set(a,b)   ((a) |  ((ulongint)1 << (b)))
-#endif
-
-#define TRUE_ (1)
-#define FALSE_ (0)
-
-/* Extern is for use with -E */
-#ifndef Extern
-#define Extern extern
-#endif
-
-/* I/O stuff */
-
-#ifdef f2c_i2
-/* for -i2 */
-typedef short flag;
-typedef short ftnlen;
-typedef short ftnint;
-#else
-
-#ifdef _LP64
-typedef int flag;
-typedef int ftnlen;
-typedef int ftnint;
-#else
-typedef long int flag;
-typedef long int ftnlen;
-typedef long int ftnint;
-#endif
-
-#endif
-
-/*external read, write*/
-typedef struct
-{       flag cierr;
-        ftnint ciunit;
-        flag ciend;
-        char *cifmt;
-        ftnint cirec;
-} cilist;
-
-/*internal read, write*/
-typedef struct
-{       flag icierr;
-        char *iciunit;
-        flag iciend;
-        char *icifmt;
-        ftnint icirlen;
-        ftnint icirnum;
-} icilist;
-
-/*open*/
-typedef struct
-{       flag oerr;
-        ftnint ounit;
-        char *ofnm;
-        ftnlen ofnmlen;
-        char *osta;
-        char *oacc;
-        char *ofm;
-        ftnint orl;
-        char *oblnk;
-} olist;
-
-/*close*/
-typedef struct
-{       flag cerr;
-        ftnint cunit;
-        char *csta;
-} cllist;
-
-/*rewind, backspace, endfile*/
-typedef struct
-{       flag aerr;
-        ftnint aunit;
-} alist;
-
-/* inquire */
-typedef struct
-{       flag inerr;
-        ftnint inunit;
-        char *infile;
-        ftnlen infilen;
-        ftnint  *inex;  /*parameters in standard's order*/
-        ftnint  *inopen;
-        ftnint  *innum;
-        ftnint  *innamed;
-        char    *inname;
-        ftnlen  innamlen;
-        char    *inacc;
-        ftnlen  inacclen;
-        char    *inseq;
-        ftnlen  inseqlen;
-        char    *indir;
-        ftnlen  indirlen;
-        char    *infmt;
-        ftnlen  infmtlen;
-        char    *inform;
-        ftnint  informlen;
-        char    *inunf;
-        ftnlen  inunflen;
-        ftnint  *inrecl;
-        ftnint  *innrec;
-        char    *inblank;
-        ftnlen  inblanklen;
-} inlist;
-
-#define VOID void
-
-union Multitype {       /* for multiple entry points */
-        integer1 g;
-        shortint h;
-        integer i;
-        /* longint j; */
-        real r;
-        doublereal d;
-        complex c;
-        doublecomplex z;
-        };
-
-typedef union Multitype Multitype;
-
-/*typedef long int Long;*/      /* No longer used; formerly in Namelist */
-
-struct Vardesc {        /* for Namelist */
-        char *name;
-        char *addr;
-        ftnlen *dims;
-        int  type;
-        };
-typedef struct Vardesc Vardesc;
-
-struct Namelist {
-        char *name;
-        Vardesc **vars;
-        int nvars;
-        };
-typedef struct Namelist Namelist;
-
-#define abs(x) ((x) >= 0 ? (x) : -(x))
-#define dabs(x) (doublereal)abs(x)
-#define min(a,b) ((a) <= (b) ? (a) : (b))
-#define max(a,b) ((a) >= (b) ? (a) : (b))
-#define dmin(a,b) (doublereal)min(a,b)
-#define dmax(a,b) (doublereal)max(a,b)
-#define bit_test(a,b)   ((a) >> (b) & 1)
-#define bit_clear(a,b)  ((a) & ~((uinteger)1 << (b)))
-#define bit_set(a,b)    ((a) |  ((uinteger)1 << (b)))
-
-/* procedure parameter types for -A and -C++ */
-
-#define F2C_proc_par_types 1
-#ifdef __cplusplus
-typedef int /* Unknown procedure type */ (*U_fp)(...);
-typedef shortint (*J_fp)(...);
-typedef integer (*I_fp)(...);
-typedef real (*R_fp)(...);
-typedef doublereal (*D_fp)(...), (*E_fp)(...);
-typedef /* Complex */ VOID (*C_fp)(...);
-typedef /* Double Complex */ VOID (*Z_fp)(...);
-typedef logical (*L_fp)(...);
-typedef shortlogical (*K_fp)(...);
-typedef /* Character */ VOID (*H_fp)(...);
-typedef /* Subroutine */ int (*S_fp)(...);
-#else
-typedef int /* Unknown procedure type */ (*U_fp)();
-typedef shortint (*J_fp)();
-typedef integer (*I_fp)();
-typedef real (*R_fp)();
-typedef doublereal (*D_fp)(), (*E_fp)();
-typedef /* Complex */ VOID (*C_fp)();
-typedef /* Double Complex */ VOID (*Z_fp)();
-typedef logical (*L_fp)();
-typedef shortlogical (*K_fp)();
-typedef /* Character */ VOID (*H_fp)();
-typedef /* Subroutine */ int (*S_fp)();
-#endif
-/* E_fp is for real functions when -R is not specified */
-typedef VOID C_f;       /* complex function */
-typedef VOID H_f;       /* character function */
-typedef VOID Z_f;       /* double complex function */
-typedef doublereal E_f; /* real function with -R not specified */
-
-/* undef any lower-case symbols that your C compiler predefines, e.g.: */
-
-#ifndef Skip_f2c_Undefs
-#undef cray
-#undef gcos
-#undef mc68010
-#undef mc68020
-#undef mips
-#undef pdp11
-#undef sgi
-#undef sparc
-#undef sun
-#undef sun2
-#undef sun3
-#undef sun4
-#undef u370
-#undef u3b
-#undef u3b2
-#undef u3b5
-#undef unix
-#undef vax
-#endif
-#endif
diff --git a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
index bccd4b8..79e52be 100644
--- a/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
+++ b/lib/Numeric/LinearAlgebra/LAPACK/lapack-aux.h
@@ -1,6 +1,45 @@
-#include "f2c.h"
+/*
+ * We have copied the definitions in f2c.h required
+ * to compile clapack.h, modified to support both
+ * 32 and 64 bit
+
+      http://opengrok.creo.hu/dragonfly/xref/src/contrib/gcc-3.4/libf2c/readme.netlib
+      http://www.ibm.com/developerworks/library/l-port64.html
+ */
+
+#ifdef _LP64
+typedef int integer;
+typedef unsigned int uinteger;
+typedef int logical;
+typedef long longint;           /* system-dependent */
+typedef unsigned long ulongint; /* system-dependent */
+#else
+typedef long int integer;
+typedef unsigned long int uinteger;
+typedef long int logical;
+typedef long long longint;              /* system-dependent */
+typedef unsigned long long ulongint;    /* system-dependent */
+#endif
+
+typedef char *address;
+typedef short int shortint;
+typedef float real;
+typedef double doublereal;
+typedef struct { real r, i; } complex;
+typedef struct { doublereal r, i; } doublecomplex;
+typedef short int shortlogical;
+typedef char logical1;
+typedef char integer1;
+
+typedef logical (*L_fp)();
+typedef short ftnlen;
+
+/********************************************************/
+
 #include "clapack.h"
 
+/********************************************************/
+
 #define DVEC(A) int A##n, double*A##p
 #define CVEC(A) int A##n, double*A##p
 #define DMAT(A) int A##r, int A##c, double* A##p