diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ca8bba839d..afa81288e6 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2000-12-01  Fernando Nasser  <fnasser@redhat.com>
+
+	* p-exp.y: Define strncasecmp as strnicmp for MSVC.
+	(yylex): Use strncasecmp, not strnicmp.
+
 2000-12-01  Fernando Nasser  <fnasser@redhat.com>
 
 	* cli/cli-decode.c: New file. Handle lists of commands, their decoding
diff --git a/gdb/p-exp.y b/gdb/p-exp.y
index 8cde6d561a..edf34ca7a5 100644
--- a/gdb/p-exp.y
+++ b/gdb/p-exp.y
@@ -58,6 +58,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "symfile.h" /* Required by objfiles.h.  */
 #include "objfiles.h" /* For have_full_symbols and have_partial_symbols */
 
+/* MSVC uses strnicmp instead of strncasecmp */
+#ifdef _MSC_VER
+#define strncasecmp strnicmp
+#endif
+
 /* Remap normal yacc parser interface names (yyparse, yylex, yyerror, etc),
    as well as gratuitiously global symbol names, so we can have multiple
    yacc generated parsers in gdb.  Note that these are only the variables
@@ -953,7 +958,7 @@ yylex ()
   /* See if it is a special token of length 3.  */
   if (explen > 2)
     for (i = 0; i < sizeof (tokentab3) / sizeof (tokentab3[0]); i++)
-      if (strnicmp (tokstart, tokentab3[i].operator, 3) == 0
+      if (strncasecmp (tokstart, tokentab3[i].operator, 3) == 0
           && (!isalpha (tokentab3[i].operator[0]) || explen == 3
               || (!isalpha (tokstart[3]) && !isdigit (tokstart[3]) && tokstart[3] != '_')))
         {
@@ -965,7 +970,7 @@ yylex ()
   /* See if it is a special token of length 2.  */
   if (explen > 1)
   for (i = 0; i < sizeof (tokentab2) / sizeof (tokentab2[0]); i++)
-      if (strnicmp (tokstart, tokentab2[i].operator, 2) == 0
+      if (strncasecmp (tokstart, tokentab2[i].operator, 2) == 0
           && (!isalpha (tokentab2[i].operator[0]) || explen == 2
               || (!isalpha (tokstart[2]) && !isdigit (tokstart[2]) && tokstart[2] != '_')))
         {