From d2eca88af5289c92809dd57fb96479de5796ef1c Mon Sep 17 00:00:00 2001
From: stig <stig@f5534014-38df-0310-8fa8-9805f1628bb7>
Date: Mon, 5 Oct 2009 15:22:34 +0000
Subject: [PATCH] Fixed a int/long warning.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@30330 f5534014-38df-0310-8fa8-9805f1628bb7
---
 mergecap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mergecap.c b/mergecap.c
index 358ebe2359..2f493c895e 100644
--- a/mergecap.c
+++ b/mergecap.c
@@ -42,10 +42,10 @@
 static int
 get_natural_int(const char *string, const char *name)
 {
-  long number;
+  int number;
   char *p;
 
-  number = strtol(string, &p, 10);
+  number = (int) strtol(string, &p, 10);
   if (p == string || *p != '\0') {
     fprintf(stderr, "mergecap: The specified %s \"%s\" isn't a decimal number\n",
 	    name, string);
@@ -67,7 +67,7 @@ get_natural_int(const char *string, const char *name)
 static int
 get_positive_int(const char *string, const char *name)
 {
-  long number;
+  int number;
 
   number = get_natural_int(string, name);
 
-- 
2.34.1