Skip to content

Commit

Permalink
Remove #include "globals.h" from packet-atalk.c (not needed) and from
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gilramir committed Dec 6, 1999
1 parent a76ce4a commit 9c863db
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
7 changes: 6 additions & 1 deletion ipproto.c
Original file line number Diff line number Diff line change
@@ -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>
*
Expand Down Expand Up @@ -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"
Expand Down
3 changes: 1 addition & 2 deletions packet-atalk.c
Original file line number Diff line number Diff line change
@@ -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>
*
Expand Down Expand Up @@ -33,7 +33,6 @@
#endif

#include <glib.h>
#include "globals.h"
#include "packet.h"
#include "packet-atalk.h"

Expand Down
6 changes: 1 addition & 5 deletions packet-ipv6.h
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -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];
Expand Down

0 comments on commit 9c863db

Please sign in to comment.