[cig-commits] r5701 - in long/3D/Gale/trunk/src/StGermain: . Base/Context/src Base/Extensibility/src Base/IO/src

[walter at geodynamics.org]

Author: walter
Date: 2007-01-08 23:49:18 -0800 (Mon, 08 Jan 2007)
New Revision: 5701

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
   long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
Log:
 r3266 at earth (orig r3947):  WalterLandry | 2007-01-07 00:58:15 -0800
 C89 fixes



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3945
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3947
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899

Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
===================================================================

Modified: long/3D/Gale/trunk/src/StGermain/Base/Extensibility/src/PluginsManager.c
===================================================================

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2007-01-09 07:47:51 UTC (rev 5700)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2007-01-09 07:49:18 UTC (rev 5701)
@@ -610,7 +610,6 @@
 		/* SGI MPI on the ess does not always print out everything before it exits
 		 To ensure all output is displayed before the program quits on firewall, sleep for one second
 		 Alan & Kath 20061006 */
-#ifndef NO_UNISTD
 		sleep( 1 );
 #endif
 		if ( nProc == 1 ) {

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c	2007-01-09 07:47:51 UTC (rev 5700)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c	2007-01-09 07:49:18 UTC (rev 5701)
@@ -1542,7 +1542,6 @@
 				self->resource );
 			exit( EXIT_FAILURE );
 		}
-
                 {
                   int i;
                   for(i=0;i<newLength;++i)