daily update

[binutils-gdb.git] / ld / ldlex.l

diff --git a/ld/ldlex.l b/ld/ldlex.l
index 68ed7fc3ce86143677e4d1be2395c297d4c0f64b..c9eb1afe39548d504215718336eaeaa8c4238718 100644 (file)
--- a/ld/ldlex.l
+++ b/ld/ldlex.l
@@ -42,7 +42,7 @@ This was written by steve chamberlain
 #include "ldmisc.h"
 #include "ldexp.h"
 #include "ldlang.h"
-#include "ldgram.h"
+#include <ldgram.h>
 #include "ldfile.h"
 #include "ldlex.h"
 #include "ldmain.h"
@@ -144,7 +144,7 @@ V_IDENTIFIER [*?.$_a-zA-Z\[\]\-\!\^]([*?.$_a-zA-Z0-9\[\]\-\!\^]|::)*
        }
     }
 
-<BOTH,SCRIPT,EXPRESSION>"/*"   { comment(); }
+<BOTH,SCRIPT,EXPRESSION,VERS_START,VERS_NODE,VERS_SCRIPT>"/*"  { comment(); }
 
 
 <DEFSYMEXP>"-"                  { RTOKEN('-');}
@@ -611,7 +611,7 @@ yy_input (buf, result, max_size)
      int max_size;
 {
   *result = 0; 
-  if (yy_current_buffer->yy_input_file)
+  if (YY_CURRENT_BUFFER->yy_input_file)
     {
       if (yyin)
        {