[Pvfs2-cvs] commit by slang in pvfs2/src/io/description: pint-request-encode.h pint-request.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2/src/io/description
In directory parlweb1:/tmp/cvs-serv32398/src/io/description

Modified Files:
      Tag: solaris-branch
	pint-request-encode.h pint-request.c 
Log Message:
initial support for solaris.  doesn't include /dev/epoll support.  See trac ticket #97.


Index: pint-request-encode.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/description/pint-request-encode.h,v
diff -p -u -r1.3 -r1.3.58.1
--- pint-request-encode.h	18 May 2006 14:51:44 -0000	1.3
+++ pint-request-encode.h	17 Apr 2009 19:18:26 -0000	1.3.58.1
@@ -57,7 +57,7 @@ encode_PVFS_Request_fields(
     char ** pptr,
     struct PINT_Request * rp)
 {
-    u_int32_t encti;
+    uint32_t encti;
     encode_PVFS_offset(pptr, &(rp)->offset);
     encode_int32_t(pptr, &(rp)->num_ereqs);
     encode_int32_t(pptr, &(rp)->num_blocks);
@@ -73,10 +73,10 @@ encode_PVFS_Request_fields(
     encode_skip4(pptr,);
 
     /* These pointers have been encoded already, just write as ints */
-    encti = (u_int32_t)(uintptr_t) (rp)->ereq;
+    encti = (uint32_t)(uintptr_t) (rp)->ereq;
     encode_uint32_t(pptr, &encti);
 
-    encti = (u_int32_t)(uintptr_t) (rp)->sreq;
+    encti = (uint32_t)(uintptr_t) (rp)->sreq;
     encode_uint32_t(pptr, &encti);
 
     return 0;
@@ -126,7 +126,7 @@ inline static
 int decode_PINT_Request(char ** pptr,
                         struct PINT_Request ** req)
 {
-    u_int32_t encti;
+    uint32_t encti;
     int i;
     int numreq;
     struct PINT_Request * rp;

Index: pint-request.c
===================================================================
RCS file: /projects/cvsroot/pvfs2/src/io/description/pint-request.c,v
diff -p -u -r1.61 -r1.61.26.1
--- pint-request.c	9 May 2007 17:45:28 -0000	1.61
+++ pint-request.c	17 Apr 2009 19:18:26 -0000	1.61.26.1
@@ -919,11 +919,11 @@ int PINT_request_decode(struct PINT_Requ
 	for (r = 0; r <= PINT_REQUEST_NEST_SIZE(req); r++)
 	{
 		/* type must match the encoding type in encode_PVFS_Request */
-		if ((u_int32_t)(intptr_t) req[r].ereq == (u_int32_t) -1)
+		if ((uint32_t)(intptr_t) req[r].ereq == (uint32_t) -1)
 			req[r].ereq = 0;
 		else
 			req[r].ereq = &req[0] + (unsigned long) req[r].ereq;
-		if ((u_int32_t)(intptr_t) req[r].sreq == (u_int32_t) -1)
+		if ((uint32_t)(intptr_t) req[r].sreq == (uint32_t) -1)
 			req[r].sreq = 0;
 		else
 			req[r].sreq = &req[0] + (unsigned long) req[r].sreq;