Index: trunk/psLib/src/config.h.in
===================================================================
--- trunk/psLib/src/config.h.in	(revision 3185)
+++ trunk/psLib/src/config.h.in	(revision 3191)
@@ -7,5 +7,5 @@
 #undef DEBUG
 
-/* Define to dummy `main' function (if any) required to link to the Fortran
+/* Define to dummy `main' function (if any) required to link to the Fortran 77
    libraries. */
 #undef F77_DUMMY_MAIN
@@ -17,7 +17,4 @@
 /* As F77_FUNC, but for C identifiers containing underscores. */
 #undef F77_FUNC_
-
-/* Define if F77 and FC dummy `main' functions are identical. */
-#undef FC_DUMMY_MAIN_EQ_F77
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
Index: trunk/psLib/src/dataIO/psLookupTable.c
===================================================================
--- trunk/psLib/src/dataIO/psLookupTable.c	(revision 3185)
+++ trunk/psLib/src/dataIO/psLookupTable.c	(revision 3191)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:54:11 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-11 20:27:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,11 +15,7 @@
 #include <string.h>
 #include <ctype.h>
-#ifdef DARWIN
 #undef __STRICT_ANSI__
-#endif
 #include <stdlib.h>
-#ifdef DARWIN
-#define __STRICT_ANSI__
-#endif
+#include <limits.h>
 #include <math.h>
 
Index: trunk/psLib/src/dataManip/dataManip.i
===================================================================
--- trunk/psLib/src/dataManip/dataManip.i	(revision 3185)
+++ trunk/psLib/src/dataManip/dataManip.i	(revision 3191)
@@ -4,5 +4,6 @@
 %include "psFunctions.h"
 %include "psMatrix.h"
-%include "psMatrixVectorArithmetic.h"
+%include "psBinaryOp.h"
+%include "psUnaryOp.h"
 %include "psMinimize.h"
 %include "psRandom.h"
Index: trunk/psLib/src/fileUtils/psLookupTable.c
===================================================================
--- trunk/psLib/src/fileUtils/psLookupTable.c	(revision 3185)
+++ trunk/psLib/src/fileUtils/psLookupTable.c	(revision 3191)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:54:11 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-11 20:27:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,11 +15,7 @@
 #include <string.h>
 #include <ctype.h>
-#ifdef DARWIN
 #undef __STRICT_ANSI__
-#endif
 #include <stdlib.h>
-#ifdef DARWIN
-#define __STRICT_ANSI__
-#endif
+#include <limits.h>
 #include <math.h>
 
Index: trunk/psLib/src/image/psImageConvolve.c
===================================================================
--- trunk/psLib/src/image/psImageConvolve.c	(revision 3185)
+++ trunk/psLib/src/image/psImageConvolve.c	(revision 3191)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 21:16:14 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-11 20:27:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include "psImageFFT.h"
 #include "psImageExtraction.h"
-#include "psMatrixVectorArithmetic.h"
+#include "psBinaryOp.h"
 #include "psMemory.h"
 #include "psLogMsg.h"
Index: trunk/psLib/src/imageops/psImageConvolve.c
===================================================================
--- trunk/psLib/src/imageops/psImageConvolve.c	(revision 3185)
+++ trunk/psLib/src/imageops/psImageConvolve.c	(revision 3191)
@@ -5,6 +5,6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-01-05 21:16:14 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-11 20:27:34 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -16,5 +16,5 @@
 #include "psImageFFT.h"
 #include "psImageExtraction.h"
-#include "psMatrixVectorArithmetic.h"
+#include "psBinaryOp.h"
 #include "psMemory.h"
 #include "psLogMsg.h"
Index: trunk/psLib/src/types/psLookupTable.c
===================================================================
--- trunk/psLib/src/types/psLookupTable.c	(revision 3185)
+++ trunk/psLib/src/types/psLookupTable.c	(revision 3191)
@@ -7,6 +7,6 @@
 *  @author Ross Harman, MHPCC
 *
-*  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-03 00:54:11 $
+*  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-11 20:27:33 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -15,11 +15,7 @@
 #include <string.h>
 #include <ctype.h>
-#ifdef DARWIN
 #undef __STRICT_ANSI__
-#endif
 #include <stdlib.h>
-#ifdef DARWIN
-#define __STRICT_ANSI__
-#endif
+#include <limits.h>
 #include <math.h>