[Pvfs2-cvs] commit by slang in pvfs2/include: pvfs2-types.h

[CVS commit program]

Update of /projects/cvsroot/pvfs2/include
In directory parlweb1:/tmp/cvs-serv26625/include

Modified Files:
      Tag: pvfs-2-7-branch
	pvfs2-types.h 
Log Message:
merge a bunch of fixes made to HEAD since 2.7.0.


Index: pvfs2-types.h
===================================================================
RCS file: /projects/cvsroot/pvfs2/include/pvfs2-types.h,v
diff -p -u -r1.145 -r1.145.2.1
--- pvfs2-types.h	18 Oct 2007 15:55:01 -0000	1.145
+++ pvfs2-types.h	1 Apr 2008 23:24:56 -0000	1.145.2.1
@@ -22,7 +22,6 @@
 #include <sys/time.h>
 #include <limits.h>
 #include <errno.h>
-#include <malloc.h>  /* pick up potential offsetof defn */
 #endif
 
 #ifndef INT32_MAX
@@ -34,10 +33,6 @@
 #define NAME_MAX 255
 #endif
 
-#ifndef offsetof
-#define offsetof(TYPE, MEMBER) ((size_t) &((TYPE *)0)->MEMBER)
-#endif
-
 /* figure out the size of a pointer */
 #if defined(__WORDSIZE)
   #define PVFS2_SIZEOF_VOIDP __WORDSIZE
@@ -776,7 +771,7 @@ PVFS_error PVFS_get_errno_mapping(PVFS_e
         PVFS_ERROR_CODE(((positive ? error :               \
                              abs(error))) & ~mask)];       \
     }                                                      \
-    return (positive ? ret : -ret);                        \
+    return ret;                        			   \
 }                                                          \
 DECLARE_ERRNO_MAPPING()
 #define PVFS_ERROR_TO_ERRNO(__error) PVFS_get_errno_mapping(__error)