[GRASS-SVN] r33719 - in grass/branches/develbranch_6: include/iostream lib/iostream

[svn_grass at osgeo.org]

Author: pkelly
Date: 2008-10-07 06:42:20 -0400 (Tue, 07 Oct 2008)
New Revision: 33719

Modified:
   grass/branches/develbranch_6/include/iostream/ami_stream.h
   grass/branches/develbranch_6/lib/iostream/mm_utils.cc
   grass/branches/develbranch_6/lib/iostream/rtimer.cc
Log:
libiostream Windows compilation fixes


Modified: grass/branches/develbranch_6/include/iostream/ami_stream.h
===================================================================
--- grass/branches/develbranch_6/include/iostream/ami_stream.h	2008-10-07 10:20:53 UTC (rev 33718)
+++ grass/branches/develbranch_6/include/iostream/ami_stream.h	2008-10-07 10:42:20 UTC (rev 33719)
@@ -34,6 +34,8 @@
 #include <iostream>
 using namespace std;
 
+#include <grass/config.h>
+
 #define MAX_STREAMS_OPEN 200
 
 #include "mm.h" // Get the memory manager.
@@ -411,7 +413,11 @@
     seek_offset = offset * sizeof(T);
   }
 
+#ifdef HAVE_LARGEFILES
   if (fseeko(fp, seek_offset, SEEK_SET) == -1) {
+#else
+  if (fseek(fp, seek_offset, SEEK_SET) == -1) {
+#endif     
     cerr << "AMI_STREAM::seek offset=" << seek_offset << " failed.\n";
     assert(0);
     exit(1);

Modified: grass/branches/develbranch_6/lib/iostream/mm_utils.cc
===================================================================
--- grass/branches/develbranch_6/lib/iostream/mm_utils.cc	2008-10-07 10:20:53 UTC (rev 33718)
+++ grass/branches/develbranch_6/lib/iostream/mm_utils.cc	2008-10-07 10:42:20 UTC (rev 33719)
@@ -17,7 +17,6 @@
  *****************************************************************************/
 
 #include <sys/types.h>
-#include <sys/mman.h>
 #include <ctype.h>
 #include <ostream>
 #include <iostream>

Modified: grass/branches/develbranch_6/lib/iostream/rtimer.cc
===================================================================
--- grass/branches/develbranch_6/lib/iostream/rtimer.cc	2008-10-07 10:20:53 UTC (rev 33718)
+++ grass/branches/develbranch_6/lib/iostream/rtimer.cc	2008-10-07 10:42:20 UTC (rev 33719)
@@ -17,7 +17,6 @@
  *****************************************************************************/
 
 #include <sys/time.h>
-#include <sys/resource.h>
 #include <stdio.h>
 #include <string.h>
 #include <strings.h>