diff --git a/src/compat/compat.c b/src/compat/compat.c index 549077ab2..4c345d8a9 100644 --- a/src/compat/compat.c +++ b/src/compat/compat.c @@ -134,11 +134,14 @@ int pthread_condmonotonic_init(pthread_cond_t* cond){ if(pthread_condattr_init(&cat)){ return -1; } + // FIXME we need a solution for this on macos/windows #ifndef __APPLE__ +#ifndef __MINGW64__ if(pthread_condattr_setclock(&cat, CLOCK_MONOTONIC)){ pthread_condattr_destroy(&cat); return -1; } +#endif #endif if(pthread_cond_init(cond, &cat)){ pthread_condattr_destroy(&cat); diff --git a/src/lib/termdesc.c b/src/lib/termdesc.c index 36c5c7aa9..b224c9013 100644 --- a/src/lib/termdesc.c +++ b/src/lib/termdesc.c @@ -832,11 +832,13 @@ int interrogate_terminfo(tinfo* ti, FILE* out, unsigned utf8, logpanic("failed opening Windows ConPTY\n"); return -1; } + /* FIXME reenable once we're using GetConsoleScreenBufferInfo() once more, maybe? unsigned ucy, ucx; if(locate_cursor(ti, &ucy, &ucx) == 0){ *cursor_y = ucy; *cursor_x = ucx; } + */ #elif defined(__linux__) ti->linux_fb_fd = -1; ti->linux_fbuffer = MAP_FAILED; @@ -1147,6 +1149,7 @@ char* termdesc_longterm(const tinfo* ti){ // is valid, we can just camp there. otherwise, we need dance with potential // user input looking at infd. int locate_cursor(tinfo* ti, unsigned* cursor_y, unsigned* cursor_x){ + /* FIXME? u7 does work... #ifdef __MINGW64__ if(ti->outhandle){ CONSOLE_SCREEN_BUFFER_INFO conbuf; @@ -1160,6 +1163,7 @@ int locate_cursor(tinfo* ti, unsigned* cursor_y, unsigned* cursor_x){ return 0; } #endif +*/ const char* u7 = get_escape(ti, ESCAPE_U7); if(u7 == NULL){ logwarn("No support in terminfo\n");