steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compile error

cvs
Slava Pestov 2004-08-19 06:29:14 +00:00
parent 9d2af6d349
commit 029e36897c
4 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
factor/jedit/FactorWordRenderer.java
View File

@ -83,7 +83,7 @@ public class FactorWordRenderer extends DefaultListCellRenderer
new String[] { new String[] {
MiscUtilities.charsToEntities(word.name), MiscUtilities.charsToEntities(word.name),
stackEffect == null stackEffect == null
? 0 : ? null :
MiscUtilities.charsToEntities(stackEffect) MiscUtilities.charsToEntities(stackEffect)
})); }));

14
native/iomux.c
View File

@ -217,27 +217,25 @@ CELL perform_io_tasks(fd_set* fdset, int fd_count, IO_TASK* io_tasks)
/* Wait for I/O and return a callback. */ /* Wait for I/O and return a callback. */
CELL next_io_task(void) CELL next_io_task(void)
{ {
CELL callback;
int i;
bool reading = set_up_fd_set(&read_fd_set, bool reading = set_up_fd_set(&read_fd_set,
read_fd_count,read_io_tasks); read_fd_count,read_io_tasks);
bool writing = set_up_fd_set(&write_fd_set, bool writing = set_up_fd_set(&write_fd_set,
write_fd_count,write_io_tasks); write_fd_count,write_io_tasks);
CELL callback;
fd_set except_fd_set;
int i;
FD_ZERO(&except_fd_set);
if(!reading && !writing) if(!reading && !writing)
critical_error("next_io_task() called with no IO tasks",0); critical_error("next_io_task() called with no IO tasks",0);
select(read_fd_count > write_fd_count ? read_fd_count : write_fd_count, select(read_fd_count > write_fd_count ? read_fd_count : write_fd_count,
&read_fd_set,&write_fd_set,&except_fd_set,NULL); &read_fd_set,&write_fd_set,NULL,NULL);
for(i = 0; i < 100; i++) for(i = 0; i < 100; i++)
{ {
if(FD_ISSET(i,&except_fd_set)) if(FD_ISSET(i,&except_fd_set))
exit(1); _exit(1);
} }
callback = perform_io_tasks(&read_fd_set,read_fd_count,read_io_tasks); callback = perform_io_tasks(&read_fd_set,read_fd_count,read_io_tasks);

2
native/iomux.h
View File

@ -19,6 +19,8 @@ fd_set write_fd_set;
IO_TASK write_io_tasks[FD_SETSIZE]; IO_TASK write_io_tasks[FD_SETSIZE];
int write_fd_count; int write_fd_count;
fd_set except_fd_set;
void init_io_tasks(fd_set* fd_set, IO_TASK* io_tasks); void init_io_tasks(fd_set* fd_set, IO_TASK* io_tasks);
void init_iomux(void); void init_iomux(void);
IO_TASK* add_io_task( IO_TASK* add_io_task(

5
native/socket.c
View File

@ -99,8 +99,6 @@ CELL accept_connection(PORT* p)
struct sockaddr_in clientname; struct sockaddr_in clientname;
size_t size = sizeof(clientname); size_t size = sizeof(clientname);
int oobinline = 1;
int new = accept(p->fd,(struct sockaddr *)&clientname,&size); int new = accept(p->fd,(struct sockaddr *)&clientname,&size);
if(new < 0) if(new < 0)
{ {
@ -110,9 +108,6 @@ CELL accept_connection(PORT* p)
io_error(__FUNCTION__); io_error(__FUNCTION__);
} }
/* if(setsockopt(new,SOL_SOCKET,SO_OOBINLINE,&oobinline,sizeof(int)) < 0)
io_error(__FUNCTION__); */
p->client_host = tag_object(from_c_string(inet_ntoa( p->client_host = tag_object(from_c_string(inet_ntoa(
clientname.sin_addr))); clientname.sin_addr)));
p->client_port = tag_fixnum(ntohs(clientname.sin_port)); p->client_port = tag_fixnum(ntohs(clientname.sin_port));