1berry/haproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BUILD: buffers: buf.h requires unistd to get ssize_t on libmusl

Browse Source 
Building with musl and gcc-5.3 for MIPS returns this :

include/common/buf.h: In function 'b_dist':
include/common/buf.h:252:2: error: unknown type name 'ssize_t'
  ssize_t dist = to - from;
  ^
Including stdint or stddef is not sufficient there to get ssize_t,
unistd is needed as well. It's likely that other platforms will have
the same issue. This patch also addresses it in ist.h and memory.h.
This commit is contained in:
Willy Tarreau 2018-11-26 19:41:40 +01:00
parent 6689609090
commit a7280a1ec2
4 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/common/buf.h
View File

@ -30,6 +30,7 @@
#include <stdint.h> #include <stdint.h>
#include <string.h> #include <string.h>
#include <unistd.h>
/* Structure defining a buffer's head */ /* Structure defining a buffer's head */
struct buffer { struct buffer {

1
include/common/ist.h
View File

@ -30,6 +30,7 @@
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
#include <unistd.h>
#include <common/config.h> #include <common/config.h>

1
include/common/memory.h
View File

@ -27,6 +27,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include <unistd.h>
#include <common/config.h> #include <common/config.h>
#include <common/mini-clist.h> #include <common/mini-clist.h>

4
include/proto/htx.h
View File

@ -440,10 +440,10 @@ static inline void htx_dump(struct htx *htx)
{ {
int32_t pos; int32_t pos;
fprintf(stderr, "htx:%p [ size=%u - data=%u - used=%u - wrap=%s - extra=%lu]\n", fprintf(stderr, "htx:%p [ size=%u - data=%u - used=%u - wrap=%s - extra=%llu]\n",
htx, htx->size, htx->data, htx->used, htx, htx->size, htx->data, htx->used,
(!htx->used || htx->tail+1 == htx->wrap) ? "NO" : "YES", (!htx->used || htx->tail+1 == htx->wrap) ? "NO" : "YES",
(unsigned long)htx->extra); (unsigned long long)htx->extra);
fprintf(stderr, "\thead=%d - tail=%u - front=%u - wrap=%u\n", fprintf(stderr, "\thead=%d - tail=%u - front=%u - wrap=%u\n",
htx_get_head(htx), htx->tail, htx->front, htx->wrap); htx_get_head(htx), htx->tail, htx->front, htx->wrap);