summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Warnicke <hagbard@physics.rutgers.edu>2001-11-22 03:07:07 +0000
committerEd Warnicke <hagbard@physics.rutgers.edu>2001-11-22 03:07:07 +0000
commitb7420272e7a8cc590f13ef14e2923c3908cbfbff (patch)
tree9f3fd554f563706e0ff318ea1b682e746f44d544
parenta07ec65cce2d9a2d34aeb8fc43c1e32e19309598 (diff)
downloadwireshark-b7420272e7a8cc590f13ef14e2923c3908cbfbff.tar.gz
Moved int-64bit.{c,h} into epan/
svn path=/trunk/; revision=4248
-rw-r--r--Makefile.am4
-rw-r--r--epan/Makefile.am4
-rw-r--r--epan/ftypes/ftype-bytes.c4
-rw-r--r--epan/int-64bit.c (renamed from int-64bit.c)2
-rw-r--r--epan/int-64bit.h (renamed from int-64bit.h)2
-rw-r--r--epan/proto.c4
6 files changed, 10 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am
index aaa30bdc09..4e742a9978 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
# Makefile.am
# Automake file for Ethereal
#
-# $Id: Makefile.am,v 1.382 2001/11/21 02:08:56 guy Exp $
+# $Id: Makefile.am,v 1.383 2001/11/22 03:07:05 hagbard Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@ethereal.com>
@@ -444,8 +444,6 @@ ETHEREAL_COMMON_SRC = \
greproto.h \
in_cksum.c \
in_cksum.h \
- int-64bit.c \
- int-64bit.h \
ipproto.c \
ipproto.h \
llcsaps.h \
diff --git a/epan/Makefile.am b/epan/Makefile.am
index edd67b335b..02e2c2b782 100644
--- a/epan/Makefile.am
+++ b/epan/Makefile.am
@@ -2,7 +2,7 @@
# Automake file for the EPAN library
# (Ethereal Protocol ANalyzer Library)
#
-# $Id: Makefile.am,v 1.28 2001/11/21 23:16:23 gram Exp $
+# $Id: Makefile.am,v 1.29 2001/11/22 03:07:06 hagbard Exp $
#
# Ethereal - Network traffic analyzer
# By Gerald Combs <gerald@zing.org>
@@ -54,6 +54,8 @@ libethereal_a_SOURCES = \
frame_data.c \
frame_data.h \
gdebug.h \
+ int-64bit.c \
+ int-64bit.h \
ipv4.c \
ipv4.h \
ipv6-utils.h \
diff --git a/epan/ftypes/ftype-bytes.c b/epan/ftypes/ftype-bytes.c
index ce43828130..63c7327501 100644
--- a/epan/ftypes/ftype-bytes.c
+++ b/epan/ftypes/ftype-bytes.c
@@ -1,5 +1,5 @@
/*
- * $Id: ftype-bytes.c,v 1.7 2001/11/02 10:09:51 guy Exp $
+ * $Id: ftype-bytes.c,v 1.8 2001/11/22 03:07:07 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -28,7 +28,7 @@
#include <string.h>
#include <ctype.h>
#include "resolv.h"
-#include "../../int-64bit.h"
+#include "int-64bit.h"
#define ETHER_LEN 6
#define IPv6_LEN 16
diff --git a/int-64bit.c b/epan/int-64bit.c
index 2f07aef184..3738512258 100644
--- a/int-64bit.c
+++ b/epan/int-64bit.c
@@ -2,7 +2,7 @@
* Routines for handling of 64-bit integers
* 2001 Ronnie Sahlberg
*
- * $Id: int-64bit.c,v 1.4 2001/11/02 10:09:47 guy Exp $
+ * $Id: int-64bit.c,v 1.1 2001/11/22 03:07:06 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
diff --git a/int-64bit.h b/epan/int-64bit.h
index 448804ce8a..c32418e903 100644
--- a/int-64bit.h
+++ b/epan/int-64bit.h
@@ -1,7 +1,7 @@
/* int-64bit.h
* Handling of 64-bit integers
*
- * $Id: int-64bit.h,v 1.3 2001/11/02 10:09:47 guy Exp $
+ * $Id: int-64bit.h,v 1.1 2001/11/22 03:07:06 hagbard Exp $
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/epan/proto.c b/epan/proto.c
index 826ff7e95f..284b437627 100644
--- a/epan/proto.c
+++ b/epan/proto.c
@@ -1,7 +1,7 @@
/* proto.c
* Routines for protocol tree
*
- * $Id: proto.c,v 1.44 2001/11/21 01:01:17 guy Exp $
+ * $Id: proto.c,v 1.45 2001/11/22 03:07:06 hagbard Exp $
*
* Ethereal - Network traffic analyzer
* By Gerald Combs <gerald@ethereal.com>
@@ -44,7 +44,7 @@
#include "plugins.h"
#include "ipv6-utils.h"
#include "proto.h"
-#include "../int-64bit.h"
+#include "int-64bit.h"
#define cVALS(x) (const value_string*)(x)