From 9d9850f209ff7b5f350c7e83719eebaa76a72edd Mon Sep 17 00:00:00 2001
From: Gilbert Ramirez <gram@alumni.rice.edu>
Date: Thu, 28 Sep 2000 03:16:29 +0000
Subject: More EPAN-related code movements. Get rid of usage of #include
 "globals.h" and #include "util.h" from epan code. Move get_home_dir() into
 epan/filesystem.c as it's used by plugins.c.

svn path=/trunk/; revision=2461
---
 globals.h | 37 +------------------------------------
 1 file changed, 1 insertion(+), 36 deletions(-)

(limited to 'globals.h')

diff --git a/globals.h b/globals.h
index b7ac278696..748bea4317 100644
--- a/globals.h
+++ b/globals.h
@@ -1,7 +1,7 @@
 /* globals.h
  * Global defines, etc.
  *
- * $Id: globals.h,v 1.21 2000/08/20 07:53:30 guy Exp $
+ * $Id: globals.h,v 1.22 2000/09/28 03:16:05 gram Exp $
  *
  * Ethereal - Network traffic analyzer
  * By Gerald Combs <gerald@zing.org>
@@ -27,43 +27,11 @@
 #define __GLOBALS_H__
 
 #include <stdio.h>
-#include "packet.h"
 #include "file.h"
 #include "timestamp.h"
 
 #define MIN_PACKET_SIZE 68	/* minimum amount of packet data we can read */
 
-/* Byte swapping routines */
-#define SWAP16(x) \
-  ( (((x) & 0x00ff) << 8) | \
-    (((x) & 0xff00) >> 8) )
-#define SWAP32(x) \
-  ( (((x) & 0x000000ff) << 24) | \
-    (((x) & 0x0000ff00) <<  8) | \
-    (((x) & 0x00ff0000) >>  8) | \
-    (((x) & 0xff000000) >> 24) )
-
-/* Byte ordering */
-#ifndef BYTE_ORDER
-# define LITTLE_ENDIAN 4321
-# define BIG_ENDIAN 1234
-# ifdef WORDS_BIGENDIAN
-#  define BYTE_ORDER BIG_ENDIAN
-# else
-#  define BYTE_ORDER LITTLE_ENDIAN
-# endif
-#endif
-
-/* From the K&R book, p. 89 */
-#ifndef MAX
-# define MAX(x, y) ((x) > (y) ? (x) : (y))
-#endif
-
-#ifndef MIN
-# define MIN(x, y) ((x) < (y) ? (x) : (y))
-#endif
-
-extern packet_info  pi;
 extern capture_file cfile;
 extern guint        main_ctx, file_ctx;
 extern gchar        comp_info_str[256];
@@ -71,11 +39,8 @@ extern gchar       *ethereal_path;
 extern gchar       *last_open_dir;
 extern gboolean     auto_scroll_live;
 extern int          g_resolving_actif;
-extern gboolean     g_ip_dscp_actif;
 extern field_info  *finfo_selected;
 
 extern ts_type timestamp_type;
 
-#define PF_DIR ".ethereal"
-
 #endif
-- 
cgit v1.2.1