Windows portability fixes

Windows needs strsep() and defines a P_WAIT constant that we
need to undefine.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2016-02-18 14:40:37 -08:00
parent e65e81b172
commit 73b22f5c1c
2 changed files with 5 additions and 1 deletions

View file

@ -129,6 +129,7 @@ AC_CHECK_FUNCS(strspn, ,
AC_CHECK_FUNCS(strcasecmp stricmp)
AC_CHECK_FUNCS(strncasecmp strnicmp)
AC_CHECK_FUNCS(strsep)
AC_CHECK_FUNCS(getuid)
AC_CHECK_FUNCS(getgid)
@ -153,7 +154,6 @@ AC_SUBST([LIBOBJDIR], [lib/])
PA_REPLACE_FUNC([vsnprintf _vsnprintf])
PA_REPLACE_FUNC([snprintf _snprintf])
PA_REPLACE_FUNC([strlcpy])
PA_REPLACE_FUNC([strsep])
dnl Check for functions that might not be declared in the headers for
dnl various idiotic reasons (mostly because of library authors

4
nasm.h
View file

@ -479,6 +479,10 @@ enum vex_class {
* prefixes, we must ensure the enumerations for prefixes and
* register names do not overlap.
*/
#ifdef P_WAIT
# undef P_WAIT /* Macro defined on some Windows versions */
#endif
enum prefixes { /* instruction prefixes */
P_none = 0,
PREFIX_ENUM_START = REG_ENUM_LIMIT,