diff --git a/src/os_unix.h b/src/os_unix.h index c3a7fec19a..00ae239ea2 100644 --- a/src/os_unix.h +++ b/src/os_unix.h @@ -128,10 +128,7 @@ # endif #endif -// on some systems time.h should not be included together with sys/time.h -#if !defined(HAVE_SYS_TIME_H) || defined(TIME_WITH_SYS_TIME) -# include -#endif +#include #ifdef HAVE_SYS_TIME_H # include #endif diff --git a/src/version.c b/src/version.c index 0422787384..370c4d06f3 100644 --- a/src/version.c +++ b/src/version.c @@ -734,6 +734,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 5139, /**/ 5138, /**/