Re: Build failure on M$ (using MSVC): Patch enclosed

[dhruva]

Hi,
 The below patch fixes the string header file issue. Since there is
support to either include the strings.h or string.h based on some
defines, I have added them in the compiler specific files for M$. If
the same is added to other platforms, we will no longer have to
include string/strings header directly, which I guess was the
intention in having it in src/config.h or nt/config.nt.

-dhruva

diff --git a/nt/gmake.defs b/nt/gmake.defs
index 00ae686..5a7b28b 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -204,7 +204,7 @@ else
 DEBUG_CFLAGS   =
 endif
 CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \
-                 $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \
+                 $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl -DHAVE_STRINGS_H \
                  $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)
 EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 $(FONT_CFLAGS)

diff --git a/nt/nmake.defs b/nt/nmake.defs
index 7c6a518..8cf9f9e 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -142,7 +142,7 @@ DEBUG_CFLAGS        = -DEMACSDEBUG
 DEBUG_CFLAGS   =

 !endif

 CFLAGS          = -I. -DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0400 \

-                 $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl \

+                 $(ARCH_CFLAGS) -D$(ARCH) -D_CRTAPI1=_cdecl -DHAVE_STRING_H \

                  $(DEBUG_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS)

 EMACS_EXTRA_C_FLAGS = $(FONT_CFLAGS)



diff --git a/src/font.c b/src/font.c
index 84f2a2a..42e62d5 100644
--- a/src/font.c
+++ b/src/font.c
@@ -22,7 +22,6 @@ along with GNU Emacs.  If not, see
<http://www.gnu.org/licenses/>.  */
 #include <config.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <strings.h>
 #include <ctype.h>
 #ifdef HAVE_M17N_FLT
 #include <m17n-flt.h>
diff --git a/src/s/ms-w32.h b/src/s/ms-w32.h
index 3e043c8..b748b3b 100644
--- a/src/s/ms-w32.h
+++ b/src/s/ms-w32.h
@@ -510,6 +510,11 @@ extern void _DebPrint (const char *fmt, ...);
 #define DebPrint(stuff)
 #endif

+#ifndef __GNUC__
+#ifndef strcasecmp
+#define strcasecmp(a,b) stricmp(a,b)
+#endif
+#endif

 /* ============================================================ */


-- 
Contents reflect my personal views only!