Remove #include "globals.h" from packet-atalk.c (not needed) and from

packet-ipv6.h. Of all the files that include packet-ipv6.h, only
ipproto.c needs "globals.h", so I put the #include in ipproto.c

svn path=/trunk/; revision=1229

3 files changed, 8 insertions, 8 deletions

diff --git a/ipproto.c b/ipproto.c
index 7cb6d24a09..70f1744b66 100644
--- a/ipproto.c
+++ b/ipproto.c
@@ -1,7 +1,7 @@
 /* ipproto.c
  * Routines for converting IPv4 protocol/v6 nxthdr field into string
  *
- * $Id: ipproto.c,v 1.4 1999/11/21 14:43:52 gram Exp $
+ * $Id: ipproto.c,v 1.5 1999/12/06 18:33:49 gram Exp $
  *
  * Gilbert Ramirez <gram@verdict.uthscsa.edu>
  *
@@ -47,6 +47,11 @@
 #endif
 
 #include <glib.h>
+
+#ifndef __GLOBALS_H__
+#include "globals.h"
+#endif
+
 #include "packet.h"
 #include "etypes.h"
 #include "packet-ip.h"
diff --git a/packet-atalk.c b/packet-atalk.c
index 71aa5ce16d..0aa8e84aed 100644
--- a/packet-atalk.c
+++ b/packet-atalk.c
@@ -1,7 +1,7 @@
 /* packet-atalk.c
  * Routines for Appletalk packet disassembly (DDP, currently).
  *
- * $Id: packet-atalk.c,v 1.22 1999/11/16 11:42:25 guy Exp $
+ * $Id: packet-atalk.c,v 1.23 1999/12/06 18:33:49 gram Exp $
  *
  * Simon Wilkinson <sxw@dcs.ed.ac.uk>
  *
@@ -33,7 +33,6 @@
 #endif
 
 #include <glib.h>
-#include "globals.h"
 #include "packet.h"
 #include "packet-atalk.h"
 
diff --git a/packet-ipv6.h b/packet-ipv6.h
index 2ca75968ee..57cd880942 100644
--- a/packet-ipv6.h
+++ b/packet-ipv6.h
@@ -1,7 +1,7 @@
 /* packet-ipv6.h
  * Definitions for IPv6 packet disassembly 
  *
- * $Id: packet-ipv6.h,v 1.9 1999/11/18 01:45:05 guy Exp $
+ * $Id: packet-ipv6.h,v 1.10 1999/12/06 18:33:49 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -26,10 +26,6 @@
 #ifndef __PACKET_IPV6_H_DEFINED__
 #define __PACKET_IPV6_H_DEFINED__
 
-#ifndef __GLOBALS_H__
-#include "globals.h"
-#endif
-
 struct e_in6_addr {
 	union {
 		guint32  u6_addr32[4];