Eliminate some uses of __STDC__.

[deliverable/binutils-gdb.git] / gdb / c-exp.y

diff --git a/gdb/c-exp.y b/gdb/c-exp.y
index a52416f48f9ea39d3b9232f666ac4eef8ad3fa8a..226fb8167113d5089a620dbdfecefac2220a6298 100644 (file)
--- a/gdb/c-exp.y
+++ b/gdb/c-exp.y
@@ -1,5 +1,6 @@
 /* YACC parser for C expressions, for GDB.
-   Copyright (C) 1986, 1989, 1990, 1991, 1993, 1994, 1996, 1997
+   Copyright 1986, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
+   1998, 1999, 2000
    Free Software Foundation, Inc.
 
 This file is part of GDB.
@@ -1433,8 +1434,6 @@ yylex ()
 
       if (c == '<')
        { 
-           if (hp_som_som_object_present)
-             {
                /* Scan ahead to get rest of the template specification.  Note
                   that we look ahead only when the '<' adjoins non-whitespace
                   characters; for comparison expressions, e.g. "a < b > c",
@@ -1444,26 +1443,6 @@ yylex ()
                if (p)
                  namelen = p - tokstart;
                break;
-             }
-           else
-             { 
-              int i = namelen;
-              int nesting_level = 1;
-              while (tokstart[++i])
-                {
-                  if (tokstart[i] == '<')
-                    nesting_level++;
-                  else if (tokstart[i] == '>')
-                    {
-                      if (--nesting_level == 0)
-                        break;
-                    }
-                }
-              if (tokstart[i] == '>')
-                namelen = i;
-              else
-                break;
-            }
        }
       c = tokstart[++namelen];
     }