From cfd52e510ac9f9735817caa4dd04acd57249ea4e Mon Sep 17 00:00:00 2001
From: tewk <tewk@unknown>
Date: Tue, 21 May 2002 23:25:23 +0000
Subject: [PATCH] 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 | 6 +++---
src/common/slurm_protocol_api.h | 6 ++++--
src/common/slurm_protocol_util.h | 1 +
3 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/common/slurm_protocol_api.c b/src/common/slurm_protocol_api.c
index a45f4f6e746..e66a1f3c912 100644
--- a/src/common/slurm_protocol_api.c
+++ b/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 ) ;
}
diff --git a/src/common/slurm_protocol_api.h b/src/common/slurm_protocol_api.h
index f69b6c75245..abc76d68a77 100644
--- a/src/common/slurm_protocol_api.h
+++ b/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 ) ;
diff --git a/src/common/slurm_protocol_util.h b/src/common/slurm_protocol_util.h
index a629444fb3a..0f94dc4fbef 100644
--- a/src/common/slurm_protocol_util.h
+++ b/src/common/slurm_protocol_util.h
@@ -1,4 +1,5 @@
#ifndef _SLURM_PROTOCOL_UTIL_H
+#define _SLURM_PROTOCOL_UTIL_H
#include <src/common/slurm_protocol_defs.h>
#include <src/common/slurm_protocol_common.h>
--
GitLab