remove old, unused cruft

diff --git a/src/defines.h b/src/defines.h
index fde28caf41836c6cb22b2789977fd6e951e12f64..a7d9339004d5a8e07051df0d17ceebffa094adf7 100644 (file)
--- a/src/defines.h
+++ b/src/defines.h
@@ -6,8 +6,6 @@
 #define FALSE 0
 #endif
 
-#define OR(A,B) (A ? A : B)
-
 #define ACL_NAME_SZ 32
 #define BROWSERNAMELEN 128
 

diff --git a/src/squid.h b/src/squid.h
index 47ac03393bc6af7b4b742bf42939aac5d3f22d51..f040873bd5a4abaecf4b4b9de2fc74e88b527e44 100644 (file)
--- a/src/squid.h
+++ b/src/squid.h
@@ -1,6 +1,6 @@
 
 /*
- * $Id: squid.h,v 1.133 1997/11/03 22:43:20 wessels Exp $
+ * $Id: squid.h,v 1.134 1997/11/10 21:07:05 wessels Exp $
  *
  * AUTHOR: Duane Wessels
  *
@@ -276,6 +276,4 @@
 #include "snprintf.h"
 #endif
 
-#define OR(A,B) (A ? A : B)
-
 #endif /* SQUID_H */

diff --git a/src/structs.h b/src/structs.h
index b9c667692b789e5e839e7c6f3121191e1d49a18b..5b5aac94e35708d037ae8deefa1db125077144f3 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -528,13 +528,6 @@ struct _ipcache_entry {
     ipcache_status_t status:3;
 };
 
-struct _ext_table_entry {
-    char *name;
-    char *mime_type;
-    char *mime_encoding;
-    char *icon;
-};
-
 struct _domain_ping {
     char *domain;
     int do_ping;               /* boolean */

diff --git a/src/typedefs.h b/src/typedefs.h
index 6307884b2ae1ddae791423feef1f9bb5489cfc0a..3260642cba801cf656e371878a57e2c9400707a7 100644 (file)
--- a/src/typedefs.h
+++ b/src/typedefs.h
@@ -41,7 +41,6 @@ typedef struct _clientHttpRequest clientHttpRequest;
 typedef struct _ConnStateData ConnStateData;
 typedef struct _ipcache_addrs ipcache_addrs;
 typedef struct _ipcache_entry ipcache_entry;
-typedef struct _ext_table_entry ext_table_entry;
 typedef struct _domain_ping domain_ping;
 typedef struct _domain_type domain_type;
 typedef struct _peer peer;
@@ -84,8 +83,6 @@ typedef void EVH(void *);
 typedef void PF(int, void *);
 typedef void DRCB(int fd, const char *buf, int size, int errflag, void *data);
 typedef void DWCB(int, int, size_t, void *);
-typedef void FILE_WALK_HD(int fd, int errflag, void *data);
-typedef void FILE_WALK_LHD(int fd, const char *buf, int size, void *line_data);
 typedef void FQDNH(const char *, void *);
 typedef int HASHCMP(const void *, const void *);
 typedef unsigned int HASHHASH(const void *, unsigned int);