added #define to broken header slurm_protocol_util.h to prevent re-include

changed variable type ssize_t in slurm_protocol_api.c to size_t
changed variable type ssize_t in slurm_protocol_api.h to size_t

src/common/slurm_protocol_api.c

@@ -10,7 +10,7 @@
 #include <src/common/xmalloc.h>
 
 
-uint32_t debug = false ;
+extern uint32_t debug ;
 
 extern int errno ;
 
@@ -169,12 +169,12 @@ slurm_fd slurm_open_stream ( slurm_addr * slurm_address )
 	return _slurm_open_stream ( slurm_address ) ;
 }
 
-ssize_t slurm_write_stream ( slurm_fd open_fd , char * buffer , size_t size )
+size_t slurm_write_stream ( slurm_fd open_fd , char * buffer , size_t size )
 {
 	return _slurm_send ( open_fd , buffer , size , NO_SEND_RECV_FLAGS ) ;
 }
 
-ssize_t slurm_read_stream ( slurm_fd open_fd , char * buffer , size_t size )
+size_t slurm_read_stream ( slurm_fd open_fd , char * buffer , size_t size )
 {
 	return _slurm_recv ( open_fd , buffer , size , NO_SEND_RECV_FLAGS ) ;
 }

src/common/slurm_protocol_api.h

@@ -4,6 +4,8 @@
 #include <sys/time.h>
 #include <stdint.h>
 #include <src/common/slurm_protocol_common.h>
+#include <src/common/slurm_protocol_util.h>
+#include <src/common/slurm_protocol_defs.h>
 
 /* high level routines */
 /* message functions */
@@ -17,8 +19,8 @@ uint32_t slurm_shutdown_message_engine ( slurm_fd open_fd ) ;
 slurm_fd slurm_listen_stream ( slurm_addr * slurm_address ) ;
 slurm_fd slurm_accept_stream ( slurm_fd open_fd , slurm_addr * slurm_address ) ;
 slurm_fd slurm_open_stream ( slurm_addr * slurm_address )	;
-ssize_t slurm_write_stream ( slurm_fd open_fd , char * buffer , size_t size ) ;
-ssize_t slurm_read_stream ( slurm_fd open_fd , char * buffer , size_t size ) ;
+size_t slurm_write_stream ( slurm_fd open_fd , char * buffer , size_t size ) ;
+size_t slurm_read_stream ( slurm_fd open_fd , char * buffer , size_t size ) ;
 uint32_t slurm_close_stream ( slurm_fd open_fd ) ;
 	
 

src/common/slurm_protocol_util.h

 #ifndef _SLURM_PROTOCOL_UTIL_H
+#define _SLURM_PROTOCOL_UTIL_H
 
 #include <src/common/slurm_protocol_defs.h>
 #include <src/common/slurm_protocol_common.h>