suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix build in static-sized fd_set mode

Browse Source 
This mode may be relevant to Sparc Solaris, for example.
This commit is contained in:
Matthew Flatt 2012-05-02 14:20:32 -06:00
parent 4581a7addf
commit 50898845ba
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/racket/src/port.c
View File

@ -789,7 +789,7 @@ void scheme_alloc_global_fdset() {
#ifdef USE_FAR_MZ_FDCALLS #ifdef USE_FAR_MZ_FDCALLS
scheme_semaphore_fd_set = (struct mz_fd_set *)scheme_alloc_fdset_array(3, 0); scheme_semaphore_fd_set = (struct mz_fd_set *)scheme_alloc_fdset_array(3, 0);
#else #else
scheme_semaphore_fd_set = (struct mz_fd_set *)scheme_malloc_atomic(sizeof(struct mz_fd_set)); scheme_semaphore_fd_set = (struct mz_fd_set *)scheme_malloc_atomic(3 * sizeof(fd_set));
#endif #endif
scheme_fdzero(MZ_GET_FDSET(scheme_semaphore_fd_set, 0)); scheme_fdzero(MZ_GET_FDSET(scheme_semaphore_fd_set, 0));
scheme_fdzero(MZ_GET_FDSET(scheme_semaphore_fd_set, 1)); scheme_fdzero(MZ_GET_FDSET(scheme_semaphore_fd_set, 1));
@ -1254,10 +1254,12 @@ void *scheme_merge_fd_sets(void *fds, void *src_fds)
for (j = 0; j < 3; j++) { for (j = 0; j < 3; j++) {
p = scheme_get_fdset(fds, j); p = scheme_get_fdset(fds, j);
sp = scheme_get_fdset(src_fds, j); sp = scheme_get_fdset(src_fds, j);
# ifdef STORED_ACTUAL_FDSET_LIMIT
if (FDSET_LIMIT(sp) > FDSET_LIMIT(p)) { if (FDSET_LIMIT(sp) > FDSET_LIMIT(p)) {
i = FDSET_LIMIT(sp); i = FDSET_LIMIT(sp);
FDSET_LIMIT(p) = i; FDSET_LIMIT(p) = i;
} }
# endif
# if defined(USE_DYNAMIC_FDSET_SIZE) # if defined(USE_DYNAMIC_FDSET_SIZE)
i = dynamic_fd_size; i = dynamic_fd_size;
# else # else