diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2016-10-19 13:13:38 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2016-10-19 13:13:38 -0700 |
| commit | 4c9132e3a0131dd5d06fbe4a739ce032271f6d44 (patch) | |
| tree | cadd74bb61b43a253c9f234863ff00f981e6d225 | |
| parent | 1fe546cf35db81bc799772e7cfad297477de2bd4 (diff) | |
| download | nasm-4c9132e3a0131dd5d06fbe4a739ce032271f6d44.tar.gz | |
compiler.h: include <sys/types.h>
Apparently, at least on some OS/2 compilers, <sys/types.h> needs to be
included for off_t to be defined. This seems like a generically good
idea to include this header whenever it is available.
Remove reference to <types.h>. This was supposedly for MSVC, but
there is no actual evidence that it is useful beyond <sys/types.h>.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | config/msvc.h | 3 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/compiler.h | 4 | ||||
| -rw-r--r-- | nasmlib/file.c | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/config/msvc.h b/config/msvc.h index 756d9570..464d06e1 100644 --- a/config/msvc.h +++ b/config/msvc.h @@ -77,9 +77,6 @@ /* Define to 1 if you have the <sys/types.h> header file. */ #define HAVE_SYS_TYPES_H 1 -/* Define to 1 if you have the <types.h> header file. */ -#define HAVE_TYPES_H 1 - /* Define to 1 if you have the `access' function. */ #define HAVE_ACCESS 1 #if _MSC_VER < 1400 diff --git a/configure.ac b/configure.ac index 537efe9c..10fed65c 100644 --- a/configure.ac +++ b/configure.ac @@ -119,6 +119,7 @@ AC_CHECK_HEADERS(unistd.h) AC_CHECK_HEADERS(sys/param.h) AC_CHECK_HEADERS(sys/mman.h) AC_CHECK_HEADERS(sys/stat.h) +AC_CHECK_HEADERS(sys/types.h) dnl Checks for library functions. AC_CHECK_FUNCS(strcasecmp stricmp) diff --git a/include/compiler.h b/include/compiler.h index b921a207..f3c87dd8 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -79,6 +79,10 @@ #include <stdarg.h> #include <stdio.h> +#ifdef HAVE_SYS_TYPES_H +# include <sys/types.h> +#endif + /* Some versions of MSVC have these only with underscores in front */ #ifndef HAVE_SNPRINTF # ifdef HAVE__SNPRINTF diff --git a/nasmlib/file.c b/nasmlib/file.c index 57cbc9cd..e525c83a 100644 --- a/nasmlib/file.c +++ b/nasmlib/file.c @@ -36,12 +36,6 @@ #include <errno.h> -#ifdef HAVE_TYPES_H -# include <types.h> -#endif -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif #ifdef HAVE_FCNTL_H # include <fcntl.h> #endif |