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

[walter at geodynamics.org]

Author: walter
Date: 2006-10-14 11:31:01 -0700 (Sat, 14 Oct 2006)
New Revision: 5020

Modified:
   long/3D/Gale/trunk/src/StGermain/
   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:
 r3047 at earth:  boo | 2006-10-14 11:08:02 -0700
  r3035 at earth (orig r3855):  KathleenHumble | 2006-10-13 00:20:36 -0700
  adding a char* cast to remove warning
  about 'change in signedness' in XML_IO_Handler
  added unistd.h header to Journal.c so it
  recognises sleep command
  
  --Al and Kath
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3046
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3854
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3047
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3855

Modified: long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2006-10-14 18:30:58 UTC (rev 5019)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/Journal.c	2006-10-14 18:31:01 UTC (rev 5020)
@@ -51,6 +51,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 
 
 Journal* stJournal = NULL;

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	2006-10-14 18:30:58 UTC (rev 5019)
+++ long/3D/Gale/trunk/src/StGermain/Base/IO/src/XML_IO_Handler.c	2006-10-14 18:31:01 UTC (rev 5020)
@@ -596,7 +596,7 @@
 		self->searchPaths,
 		self->searchPathsSize ) )
 	{
-		_XML_IO_Handler_OpenFile( self, absolute );
+		_XML_IO_Handler_OpenFile( self, (char*)absolute );
 	}
 
 	Journal_Firewall( self->currDoc != NULL,