diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/appweb/ejs/ejsLib.c | 4 | ||||
| -rw-r--r-- | source4/lib/appweb/mpr/miniMpr.h | 3 | ||||
| -rw-r--r-- | source4/lib/socket_wrapper/socket_wrapper.c | 2 |
3 files changed, 3 insertions, 6 deletions
diff --git a/source4/lib/appweb/ejs/ejsLib.c b/source4/lib/appweb/ejs/ejsLib.c index af5ce52731..0dfc2e0ed2 100644 --- a/source4/lib/appweb/ejs/ejsLib.c +++ b/source4/lib/appweb/ejs/ejsLib.c @@ -64,8 +64,8 @@ static void *lockData; this is a workaround for the use of global variables in ejs */ struct ejs_state_ctx { - struct MprVar master; - struct MprArray *ejsList; + MprVar master; + MprArray *ejsList; }; void *ejs_save_state(void) diff --git a/source4/lib/appweb/mpr/miniMpr.h b/source4/lib/appweb/mpr/miniMpr.h index 0b2dc3490d..bf57d50abc 100644 --- a/source4/lib/appweb/mpr/miniMpr.h +++ b/source4/lib/appweb/mpr/miniMpr.h @@ -185,9 +185,6 @@ typedef char* MprStr; #ifndef __cplusplus typedef unsigned char uchar; -#ifndef __bool_true_false_are_defined -typedef int bool; -#endif #endif /* diff --git a/source4/lib/socket_wrapper/socket_wrapper.c b/source4/lib/socket_wrapper/socket_wrapper.c index 6e6711834b..6bb7f6464f 100644 --- a/source4/lib/socket_wrapper/socket_wrapper.c +++ b/source4/lib/socket_wrapper/socket_wrapper.c @@ -462,7 +462,7 @@ _PUBLIC_ int swrap_accept(int s, struct sockaddr *addr, socklen_t *addrlen) child_si->protocol = parent_si->protocol; child_si->bound = 1; - ret = real_getsockname(fd, &un_my_addr, &un_my_addrlen); + ret = real_getsockname(fd, (struct sockaddr *)&un_my_addr, &un_my_addrlen); if (ret == -1) return ret; ret = sockaddr_convert_from_un(child_si, &un_my_addr, un_my_addrlen, |