Index: src/util/wrappers/mpiu_shm_wrappers.h
===================================================================
--- src/util/wrappers/mpiu_shm_wrappers.h	(revision 9448)
+++ src/util/wrappers/mpiu_shm_wrappers.h	(working copy)
@@ -250,7 +250,7 @@
     }
 }
 
-static inline int MPIU_SHMW_Seg_open(MPIU_SHMW_Hnd_t hnd, int seg_sz);
+static inline int MPIU_SHMW_Seg_open(MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz);
 static inline int MPIU_SHMW_Hnd_deserialize_by_ref(MPIU_SHMW_Hnd_t hnd, char **ser_hnd_ptr);
 
 /* FIXME : Don't print ENGLISH strings on error. Define the error
@@ -457,7 +457,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_create_attach_templ(
-    MPIU_SHMW_Hnd_t hnd, int seg_sz, char **shm_addr_ptr,
+    MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz, char **shm_addr_ptr,
     int offset, int flag)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -522,7 +522,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_detach(
-    MPIU_SHMW_Hnd_t hnd, char **shm_addr_ptr, int seg_sz)
+    MPIU_SHMW_Hnd_t hnd, char **shm_addr_ptr, MPIU_Size_t seg_sz)
 {
     int mpi_errno = MPI_SUCCESS;
     int rc = -1;
@@ -588,7 +588,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_create_attach_templ(
-    MPIU_SHMW_Hnd_t hnd, int seg_sz, char **shm_addr_ptr,
+    MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz, char **shm_addr_ptr,
     int offset, int flag)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -672,7 +672,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_detach(
-    MPIU_SHMW_Hnd_t hnd, char **shm_addr_ptr, int seg_sz)
+    MPIU_SHMW_Hnd_t hnd, char **shm_addr_ptr, MPIU_Size_t seg_sz)
 {
     int mpi_errno = MPI_SUCCESS;
     int rc = -1;
@@ -722,7 +722,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_create_attach_templ(
-    MPIU_SHMW_Hnd_t hnd, int seg_sz, char **shm_addr_ptr,
+    MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz, char **shm_addr_ptr,
     int offset, int flag)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -788,7 +788,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_detach(
-    MPIU_SHMW_Hnd_t hnd, char **shm_addr_ptr, int seg_sz)
+    MPIU_SHMW_Hnd_t hnd, char **shm_addr_ptr, MPIU_Size_t seg_sz)
 {
     int mpi_errno = MPI_SUCCESS;
     int rc = -1;
@@ -825,7 +825,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_create(
-    MPIU_SHMW_Hnd_t hnd, int seg_sz)
+    MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz)
 {
     int mpi_errno = MPI_SUCCESS;
 
@@ -852,7 +852,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_open(
-    MPIU_SHMW_Hnd_t hnd, int seg_sz)
+    MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz)
 {
     int mpi_errno = MPI_SUCCESS;
 
@@ -880,7 +880,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_create_and_attach(
-    MPIU_SHMW_Hnd_t hnd, int seg_sz, char **shm_addr_ptr, 
+    MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz, char **shm_addr_ptr, 
     int offset)
 {
     int mpi_errno = MPI_SUCCESS;
@@ -912,7 +912,7 @@
 #undef FCNAME
 #define FCNAME MPIU_QUOTE(FUNCNAME)
 static inline int MPIU_SHMW_Seg_attach(
-    MPIU_SHMW_Hnd_t hnd, int seg_sz, char **shm_addr_ptr,
+    MPIU_SHMW_Hnd_t hnd, MPIU_Size_t seg_sz, char **shm_addr_ptr,
     int offset)
 {
     int mpi_errno = MPI_SUCCESS;