Update our yasm copy to yasm 1.1.0 (Part 1: yasm side)...

third_party/yasm/patched-yasm/libyasm/linemap.h

 /**
  * \file libyasm/linemap.h
  * \brief YASM virtual line mapping interface.
  *
  * \rcs
- * $Id: linemap.h 2101 2008-05-23 06:46:51Z peter $
+ * $Id: linemap.h 2259 2010-01-03 01:58:23Z peter $
  * \endrcs
  *
  * \license
  *  Copyright (C) 2002-2007  Peter Johnson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 67 matching lines @@
                              /*@null@*/ yasm_bytecode *bc,
                              const char *source);
 
 /** Go to the next line (increments the current virtual line).
  * \param linemap       line mapping repository
  * \return The current (new) virtual line.
  */
 YASM_LIB_DECL
 unsigned long yasm_linemap_goto_next(yasm_linemap *linemap);
 
-/** Set a new file/line physical association starting point at the current
+/** Set a new file/line physical association starting point at the specified
  * virtual line.  line_inc indicates how much the "real" line is incremented
  * by for each virtual line increment (0 is perfectly legal).
  * \param linemap       line mapping repository
  * \param filename      physical file name (if NULL, not changed)
+ * \param virtual_line  virtual line number (if 0, linemap->current is used)
  * \param file_line     physical line number
  * \param line_inc      line increment
  */
 YASM_LIB_DECL
 void yasm_linemap_set(yasm_linemap *linemap, /*@null@*/ const char *filename,
-                      unsigned long file_line, unsigned long line_inc);
+                      unsigned long virtual_line, unsigned long file_line,
+                      unsigned long line_inc);
 
 /** Poke a single file/line association, restoring the original physical
  * association starting point.  Caution: increments the current virtual line
  * twice.
  * \param linemap       line mapping repository
  * \param filename      physical file name (if NULL, not changed)
  * \param file_line     physical line number
  * \return The virtual line number of the poked association.
  */
 YASM_LIB_DECL
@@ skipping 19 matching lines @@
  * \param func          function
  * \return Stops early (and returns func's return value) if func returns a
  *         nonzero value; otherwise 0.
  */
 YASM_LIB_DECL
 int yasm_linemap_traverse_filenames
     (yasm_linemap *linemap, /*@null@*/ void *d,
      int (*func) (const char *filename, void *d));
 
 #endif