[GRASS-SVN] r53304 - grass/trunk/lib/raster3d

[svn_grass at osgeo.org]

Author: glynn
Date: 2012-10-03 05:26:25 -0700 (Wed, 03 Oct 2012)
New Revision: 53304

Modified:
   grass/trunk/lib/raster3d/doubleio.c
   grass/trunk/lib/raster3d/intio.c
Log:
Fix r53301


Modified: grass/trunk/lib/raster3d/doubleio.c
===================================================================
--- grass/trunk/lib/raster3d/doubleio.c	2012-10-03 10:13:41 UTC (rev 53303)
+++ grass/trunk/lib/raster3d/doubleio.c	2012-10-03 12:26:25 UTC (rev 53304)
@@ -4,18 +4,12 @@
 #include <unistd.h>
 #include "raster3d_intern.h"
 
-#ifndef _GNU_H_WINDOWS32_SOCKETS
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-typedef unsigned short u_short;
-#endif
-
 /*---------------------------------------------------------------------------*/
 
 int Rast3d_write_doubles(int fd, int useXdr, const double *i, int nofNum)
 {
     char xdrDoubleBuf[RASTER3D_XDR_DOUBLE_LENGTH * 1024];
-    u_int n;
+    unsigned int n;
 
     if (nofNum <= 0)
 	Rast3d_fatal_error("Rast3d_write_doubles: nofNum out of range");
@@ -57,7 +51,7 @@
 int Rast3d_read_doubles(int fd, int useXdr, double *i, int nofNum)
 {
     char xdrDoubleBuf[RASTER3D_XDR_DOUBLE_LENGTH * 1024];
-    u_int n;
+    unsigned int n;
 
     if (nofNum <= 0)
 	Rast3d_fatal_error("Rast3d_read_doubles: nofNum out of range");

Modified: grass/trunk/lib/raster3d/intio.c
===================================================================
--- grass/trunk/lib/raster3d/intio.c	2012-10-03 10:13:41 UTC (rev 53303)
+++ grass/trunk/lib/raster3d/intio.c	2012-10-03 12:26:25 UTC (rev 53304)
@@ -4,18 +4,12 @@
 #include <unistd.h>
 #include "raster3d_intern.h"
 
-#ifndef _GNU_H_WINDOWS32_SOCKETS
-typedef unsigned int u_int;
-typedef unsigned long u_long;
-typedef unsigned short u_short;
-#endif
-
 /*---------------------------------------------------------------------------*/
 
 int Rast3d_write_ints(int fd, int useXdr, const int *i, int nofNum)
 {
     char xdrIntBuf[RASTER3D_XDR_INT_LENGTH * 1024];
-    u_int n;
+    unsigned int n;
 
     if (nofNum <= 0)
 	Rast3d_fatal_error("Rast3d_write_ints: nofNum out of range");
@@ -57,7 +51,7 @@
 int Rast3d_read_ints(int fd, int useXdr, int *i, int nofNum)
 {
     char xdrIntBuf[RASTER3D_XDR_INT_LENGTH * 1024];
-    u_int n;
+    unsigned int n;
 
     if (nofNum <= 0)
 	Rast3d_fatal_error("Rast3d_read_ints: nofNum out of range");