diff options
| author | obiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-18 01:41:14 +0000 |
|---|---|---|
| committer | obiot <obiot@f5534014-38df-0310-8fa8-9805f1628bb7> | 2004-01-18 01:41:14 +0000 |
| commit | f6618a45ca9daabe8bd2f5c32fdaa3ecc166bb59 (patch) | |
| tree | 0d87d92993969b1b1fb61bdd7ca48511898ce15c /mergecap.c | |
| parent | 372171be017a5d51d2d174feda2d1423a024bfec (diff) | |
Nice rendering of the CVS version as "(cvs 200401181200003000)".
The make-version.pl script only defines CVSVERSION if this was a build
from CVS.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@9701 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'mergecap.c')
| -rw-r--r-- | mergecap.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/mergecap.c b/mergecap.c index 5abe344d53..30bd1dbfab 100644 --- a/mergecap.c +++ b/mergecap.c @@ -1,6 +1,6 @@ /* Combine two dump files, either by appending or by merging by timestamp * - * $Id: mergecap.c,v 1.12 2004/01/16 20:03:10 jmayer Exp $ + * $Id: mergecap.c,v 1.13 2004/01/18 01:41:14 obiot Exp $ * * Written by Scott Renfro <scott@renfro.org> based on * editcap by Richard Sharpe and Guy Harris @@ -445,7 +445,11 @@ main(int argc, char *argv[]) break; case 'h': - fprintf(stderr, "mergecap version %s%s\n", VERSION, CVSVERSION); + fprintf(stderr, "mergecap version %s" +#ifdef CVSVERSION + " (cvs " CVSVERSION ")" +#endif + "\n", VERSION); usage(); exit(1); break; |