Index: trunk/psLib/src/astro/psCoord.c
===================================================================
--- trunk/psLib/src/astro/psCoord.c	(revision 3109)
+++ trunk/psLib/src/astro/psCoord.c	(revision 3114)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.48 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-02-02 21:10:37 $
+*  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-03 00:45:06 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -599,6 +599,6 @@
 XXX: How to compound errors?
  *****************************************************************************/
-psSphere* psSphereGetOffset(const psSphere* restrict position1,
-                            const psSphere* restrict position2,
+psSphere* psSphereGetOffset(const psSphere* position1,
+                            const psSphere* position2,
                             psSphereOffsetMode mode,
                             psSphereOffsetUnit unit)
@@ -683,6 +683,6 @@
  *****************************************************************************/
 
-psSphere* psSphereSetOffset(const psSphere* restrict position,
-                            const psSphere* restrict offset,
+psSphere* psSphereSetOffset(const psSphere* position,
+                            const psSphere* offset,
                             psSphereOffsetMode mode,
                             psSphereOffsetUnit unit)
Index: trunk/psLib/src/astro/psCoord.h
===================================================================
--- trunk/psLib/src/astro/psCoord.h	(revision 3109)
+++ trunk/psLib/src/astro/psCoord.h	(revision 3114)
@@ -10,6 +10,6 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-01-26 20:24:16 $
+*  @version $Revision: 1.25 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-02-03 00:45:06 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -346,6 +346,6 @@
  */
 psSphere* psSphereGetOffset(
-    const psSphere* restrict position1,
-    const psSphere* restrict position2,
+    const psSphere* position1,
+    const psSphere* position2,
     psSphereOffsetMode mode,
     psSphereOffsetUnit unit
@@ -364,6 +364,6 @@
  */
 psSphere* psSphereSetOffset(
-    const psSphere* restrict position,
-    const psSphere* restrict offset,
+    const psSphere* position,
+    const psSphere* offset,
     psSphereOffsetMode mode,
     psSphereOffsetUnit unit
Index: trunk/psLib/src/astro/psTime.c
===================================================================
--- trunk/psLib/src/astro/psTime.c	(revision 3109)
+++ trunk/psLib/src/astro/psTime.c	(revision 3114)
@@ -10,6 +10,6 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.49 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-12-17 20:47:08 $
+ *  @version $Revision: 1.50 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-02-03 00:45:06 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35,8 +35,5 @@
 #include "psAstronomyErrors.h"
 
-#ifndef TIME_CONFIG_FILE
-#define TIME_CONFIG_FILE "../../config/psTime.config"
-#pragma warning TIME_CONFIG_FILE was not defined in the makefile.
-#endif
+#include "config.h"
 
 #define MAX_STRING_LENGTH 256
@@ -151,5 +148,5 @@
     // Check time metadata. Function call reports errors.
     if(timeMetadata == NULL) {
-        if(!p_psTimeInit(TIME_CONFIG_FILE))
+        if(!p_psTimeInit(CONFIG_FILE))
             return 0.0;
     }
@@ -708,5 +705,5 @@
     // Check time metadata
     if(timeMetadata == NULL) {
-        if(!p_psTimeInit(TIME_CONFIG_FILE)) {
+        if(!p_psTimeInit(CONFIG_FILE)) {
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_FILE_NOT_FOUND, "psTime.config");
             return 0.0;