diff options
| -rw-r--r-- | src/os_unix.c | 17 | ||||
| -rw-r--r-- | src/os_unixx.h | 28 |
2 files changed, 16 insertions, 29 deletions
diff --git a/src/os_unix.c b/src/os_unix.c index 4a32d77d8c..03ea2a7c0d 100644 --- a/src/os_unix.c +++ b/src/os_unix.c @@ -57,7 +57,22 @@ #include "os/signal.h" #include "os/job.h" -#include "os_unixx.h" /* unix includes for os_unix.c only */ +#if defined(HAVE_SYS_IOCTL_H) +# include <sys/ioctl.h> +#endif + +#ifdef HAVE_STROPTS_H +# include <stropts.h> +#endif + +#if defined(HAVE_TERMIOS_H) +# include <termios.h> +#endif + +/* shared library access */ +#if defined(HAVE_DLFCN_H) && defined(USE_DLOPEN) +# include <dlfcn.h> +#endif #ifdef HAVE_SELINUX # include <selinux/selinux.h> diff --git a/src/os_unixx.h b/src/os_unixx.h deleted file mode 100644 index 7ca0107c50..0000000000 --- a/src/os_unixx.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * VIM - Vi IMproved by Bram Moolenaar - * - * Do ":help uganda" in Vim to read copying and usage conditions. - * Do ":help credits" in Vim to see a list of people who contributed. - */ - -/* - * os_unixx.h -- include files that are only used in os_unix.c - */ - -#if defined(HAVE_SYS_IOCTL_H) -# include <sys/ioctl.h> -#endif - -#ifdef HAVE_STROPTS_H -# include <stropts.h> -#endif - -#if defined(HAVE_TERMIOS_H) -# include <termios.h> -#endif - -/* shared library access */ -#if defined(HAVE_DLFCN_H) && defined(USE_DLOPEN) -# include <dlfcn.h> -#endif - |