Fix build break

This commit is contained in:
Arun Prakash Jana 2020-05-19 08:50:04 +05:30
parent 1b5c3096ca
commit 709b2f229e
No known key found for this signature in database
GPG key ID: A75979F35C080412

View file

@ -2304,18 +2304,6 @@ static int nextsel(int presel)
{ {
int c = presel; int c = presel;
uint i; uint i;
#ifdef LINUX_INOTIFY
struct inotify_event *event;
char inotify_buf[EVENT_BUF_LEN];
memset((void *)inotify_buf, 0x0, EVENT_BUF_LEN);
#elif defined(BSD_KQUEUE)
struct kevent event_data[NUM_EVENT_SLOTS];
memset((void *)event_data, 0x0, sizeof(struct kevent) * NUM_EVENT_SLOTS);
#elif defined(HAIKU_NM)
// TODO: Do some Haiku declarations
#endif
if (c == 0 || c == MSGWAIT) { if (c == 0 || c == MSGWAIT) {
c = getch(); c = getch();
@ -2351,6 +2339,10 @@ static int nextsel(int presel)
*/ */
#ifdef LINUX_INOTIFY #ifdef LINUX_INOTIFY
if (!cfg.selmode && !cfg.blkorder && inotify_wd >= 0 && (idle & 1)) { if (!cfg.selmode && !cfg.blkorder && inotify_wd >= 0 && (idle & 1)) {
struct inotify_event *event;
char inotify_buf[EVENT_BUF_LEN];
memset((void *)inotify_buf, 0x0, EVENT_BUF_LEN);
i = read(inotify_fd, inotify_buf, EVENT_BUF_LEN); i = read(inotify_fd, inotify_buf, EVENT_BUF_LEN);
if (i > 0) { if (i > 0) {
for (char *ptr = inotify_buf; for (char *ptr = inotify_buf;
@ -2372,10 +2364,13 @@ static int nextsel(int presel)
} }
} }
#elif defined(BSD_KQUEUE) #elif defined(BSD_KQUEUE)
if (!cfg.selmode && !cfg.blkorder && event_fd >= 0 && idle & 1 if (!cfg.selmode && !cfg.blkorder && event_fd >= 0 && idle & 1) {
&& kevent(kq, events_to_monitor, NUM_EVENT_SLOTS, struct kevent event_data[NUM_EVENT_SLOTS];
event_data, NUM_EVENT_FDS, &gtimeout) > 0)
memset((void *)event_data, 0x0, sizeof(struct kevent) * NUM_EVENT_SLOTS);
if (kevent(kq, events_to_monitor, NUM_EVENT_SLOTS, event_data, NUM_EVENT_FDS, &gtimeout) > 0)
c = CONTROL('L'); c = CONTROL('L');
}
#elif defined(HAIKU_NM) #elif defined(HAIKU_NM)
if (!cfg.selmode && !cfg.blkorder && haiku_nm_active && idle & 1 && haiku_is_update_needed(haiku_hnd)) if (!cfg.selmode && !cfg.blkorder && haiku_nm_active && idle & 1 && haiku_is_update_needed(haiku_hnd))
c = CONTROL('L'); c = CONTROL('L');
@ -6983,7 +6978,7 @@ int main(int argc, char *argv[])
break; break;
case 'P': case 'P':
if (env_opts_id < 0 && !optarg[1]) if (env_opts_id < 0 && !optarg[1])
pkey = optarg[0]; pkey = (uchar)optarg[0];
break; break;
case 'Q': case 'Q':
g_states |= STATE_FORCEQUIT; g_states |= STATE_FORCEQUIT;