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

[walter at geodynamics.org]

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

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/IO/src/Journal.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/MPIFile.c
   long/3D/Gale/trunk/src/StGermain/Base/IO/src/PathUtils.c
Log:
 r3270 at earth (orig r3951):  WalterLandry | 2007-01-08 17:35:29 -0800
 Add workarounds for Windows lack of unistd and sys/stat



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:3950
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3899
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3196
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/branches/decomp3d/StGermain:3951
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/IO/src/Journal.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2007-01-09 07:49:27 UTC (rev 5704)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2007-01-09 07:49:44 UTC (rev 5705)
@@ -610,6 +610,7 @@
 		/* 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/MPIFile.c
===================================================================

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/PathUtils.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/PathUtils.c	2007-01-09 07:49:27 UTC (rev 5704)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/PathUtils.c	2007-01-09 07:49:44 UTC (rev 5705)
@@ -316,7 +316,7 @@
 			Memory_Free( parent );
 		}
 
-#ifdef NO_UNISTD
+#ifdef NO_SYS_STAT
 		ret = mkdir( path);
 #else
 		ret = mkdir( path, S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH );