Index: trunk/archive/pslib/include/psMath.h
===================================================================
--- trunk/archive/pslib/include/psMath.h	(revision 380)
+++ trunk/archive/pslib/include/psMath.h	(revision 753)
@@ -11,9 +11,9 @@
     psType type;			///< data type information
     union {			       
-	int i;				///< integer value entry
-	float f;			///< float value entry
-	double d;			///< double value entry
-	complex float c;		///< complex value entry
-    } val;
+	psS32 S32;			///< integer value entry
+	psF32 F32;			///< float value entry
+	psF64 F64;			///< double value entry
+	psC32 C32;			///< complex value entry
+    } data;
 } p_psScalar;
 
@@ -28,6 +28,6 @@
 	    void *in1,			///< first input
 	    char *op,			///< operator 
-	    void *in2			///< second input
-    );
+	    void *in2)			///< second input
+;
 
 /** Perform a unary operation on two data items (psImage, psVector, psScalar). */
@@ -35,6 +35,6 @@
 psUnaryOp (void *out,			///< destination (may be NULL) 
 	   void *in,			///< input
-	   char *op			///< operator 
-    );
+	   char *op)			///< operator 
+;
 
 /** create a psType-ed structure from a constant double value. */
@@ -45,6 +45,6 @@
 p_psScalar *
 psScalarType (char *mode, 		///< type description 
-	      ...			///< value (or values) of specified types
-    );
+	      ...)			///< value (or values) of specified types
+;
 
 /* \} */ // End of MathGroup Functions