80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Fixed network.c conflict.

Browse Source
This commit is contained in:
waltje
2017-05-09 23:05:18 -04:00
parent 578619d11f 2e3ce399e2
commit feb2846018
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/net_ne2000.c
View File

@@ -255,8 +255,8 @@ nelog(int lvl, const char *fmt, ...)
vprintf(fmt, ap);
va_end(ap);
}
}
#endif
}
#define pclog nelog

3
src/network.c
View File

@@ -38,6 +38,7 @@ typedef struct {
static int net_handlers_num;
static int net_poll_time = 0;
static int net_poll_time;
static NETPOLL net_handlers[8];
static NETCARD net_cards[] = {
@@ -59,7 +60,7 @@ net_poll(void *priv)
int c;
/* Reset the poll timer. */
net_poll_time += (uint32_t)((double)TIMER_USEC * (1000000.0/8.0/3000.0));
net_poll_time += (int)((double)TIMER_USEC * (1000000.0/8.0/3000.0));
/* If we have active cards.. */
if (net_handlers_num) {