Cleaned up a couple of types in the pack and unpack routines.

This commit was SVN r5205.

src/communicator/comm_cid.c

@@ -623,7 +623,7 @@ static int ompi_comm_allreduce_intra_oob (int *inbuf, int *outbuf,
     
     
     local_rank = ompi_comm_rank ( comm );
-    tmpbuf     = (int *) malloc ( count * sizeof(int));
+    tmpbuf     = (int *) malloc ( count * sizeof(int32_t));
     if ( NULL == tmpbuf ) {
         return MPI_ERR_INTERN;
     }
@@ -641,7 +641,7 @@ static int ompi_comm_allreduce_intra_oob (int *inbuf, int *outbuf,
         sbuf = OBJ_NEW(orte_buffer_t);
         rbuf = OBJ_NEW(orte_buffer_t);
         
-        if (ORTE_SUCCESS != (rc = orte_dps.pack(sbuf, tmpbuf, count, ORTE_INT32))) {
+        if (ORTE_SUCCESS != (rc = orte_dps.pack(sbuf, tmpbuf, count, ORTE_INT))) {
             goto exit;
         }
 
@@ -654,7 +654,7 @@ static int ompi_comm_allreduce_intra_oob (int *inbuf, int *outbuf,
             rc = orte_rml.send_buffer(remote_leader, sbuf, 0, 0);
         }
 
-        if (ORTE_SUCCESS != (rc = orte_dps.unpack(rbuf, outbuf, (size_t*)&count, ORTE_INT32))) {
+        if (ORTE_SUCCESS != (rc = orte_dps.unpack(rbuf, outbuf, (size_t*)&count, ORTE_INT))) {
             goto exit;
         }
         OBJ_RELEASE(sbuf);

src/communicator/comm_dyn.c

@@ -50,7 +50,7 @@ int ompi_comm_connect_accept ( ompi_communicator_t *comm, int root,
                                orte_process_name_t *port, int send_first,
                                ompi_communicator_t **newcomm, orte_rml_tag_t tag )
 {
-    int size, rsize, rank, rc;
+    int32_t size, rsize, rank, rc;
     size_t num_vals;
     size_t namebuflen, rnamebuflen;
     void *namebuf=NULL, *rnamebuf=NULL;