[nasm:elfmerge] Windows portability fixes

[nasm-bot f. H. P. A. <hp...@li...>]

Commit-ID:  73b22f5c1c8372bc5fc64962d38a75e9d6998f69
Gitweb:     http://repo.or.cz/w/nasm.git?a=commitdiff;h=73b22f5c1c8372bc5fc64962d38a75e9d6998f69
Author:     H. Peter Anvin <hp...@li...>
AuthorDate: Thu, 18 Feb 2016 14:40:37 -0800
Committer:  H. Peter Anvin <hp...@li...>
CommitDate: Thu, 18 Feb 2016 14:40:37 -0800

Windows portability fixes

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

Signed-off-by: H. Peter Anvin <hp...@li...>


---
 configure.in | 2 +-
 nasm.h       | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/configure.in b/configure.in
index 98e151c..38306c2 100644
--- a/configure.in
+++ b/configure.in
@@ -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
diff --git a/nasm.h b/nasm.h
index 517d924..9e4fa96 100644
--- a/nasm.h
+++ b/nasm.h
@@ -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,