Bladeren bron

Fix https://trac.osgeo.org/grass/changeset/53301

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@53304 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 12 jaren geleden
bovenliggende
commit
994c96e2fe
2 gewijzigde bestanden met toevoegingen van 4 en 16 verwijderingen
  1. 2 8
      lib/raster3d/doubleio.c
  2. 2 8
      lib/raster3d/intio.c

+ 2 - 8
lib/raster3d/doubleio.c

@@ -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_write_doubles(int fd, int useXdr, const double *i, int nofNum)
 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");

+ 2 - 8
lib/raster3d/intio.c

@@ -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_write_ints(int fd, int useXdr, const int *i, int nofNum)
 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");