Get rid of C++/C99-style comments.

[metze/wireshark/wip.git] / merge.h

diff --git a/merge.h b/merge.h
index afa28bdedf000512beec9e09a5ea83587b5818a3..a9a36f2c9308d416ae2b550dd6e9d6397e32ee25 100644 (file)
--- a/merge.h
+++ b/merge.h
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #ifndef __MERGE_H__
@@ -44,8 +44,10 @@ typedef struct merge_in_file_s {
   wtap           *wth;
   gint64          data_offset;
   in_file_state_e state;
-  guint32         packet_num;  /* current packet number */
-  gint64          size;                /* file size */
+  guint32         packet_num;    /* current packet number */
+  gint64          size;                      /* file size */
+  guint32         interface_id;   /* identifier of the interface. 
+                                                                  * Used for fake interfaces when writing WTAP_ENCAP_PER_PACKET */
 } merge_in_file_t;
 
 /** Open a number of input files to merge.