From d8096494842d5c9e9aefa669320a5f19f10a69f5 Mon Sep 17 00:00:00 2001
From: Kevin Easton <keaston@users.sourceforge.net>
Date: Wed, 7 May 2008 11:07:31 +0000
Subject: [PATCH] Merge r23 from branches/ircii-pana-1.1

Changes to allow compiling on gcc-4.0.


git-svn-id: svn://svn.code.sf.net/p/bitchx/code/trunk@40 13b04d17-f746-0410-82c6-800466cd88b0
---
 dll/aim/toc/toc.h | 5 -----
 include/ctcp.h    | 1 -
 include/modval.h  | 4 ++--
 include/struct.h  | 1 -
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/dll/aim/toc/toc.h b/dll/aim/toc/toc.h
index f55aaec..b70a072 100644
--- a/dll/aim/toc/toc.h
+++ b/dll/aim/toc/toc.h
@@ -150,9 +150,6 @@ void toc_build_config(char *s, int len);
 void parse_toc_buddy_list(char *);
 void translate_toc_error_code(char *c);
 
-extern int toc_fd;
-extern int seqno;
-extern unsigned int peer_ver;
 extern int state;
 /* extern int inpa; */
 
@@ -207,9 +204,7 @@ int check_idle();
 void serv_set_away(char *message);
 
 extern int idle_timer;
-extern time_t lastsent;
 extern time_t login_time;
-extern struct timeval lag_tv;
 extern int is_idle;
 extern int lag_ms;
 extern int permdeny;
diff --git a/include/ctcp.h b/include/ctcp.h
index 54d6071..560f143 100644
--- a/include/ctcp.h
+++ b/include/ctcp.h
@@ -56,7 +56,6 @@
 extern CtcpEntryDll *dll_ctcp;
 
 
-extern		char	*ctcp_type[];
 extern		int	sed;
 extern		int	in_ctcp_flag;
 
diff --git a/include/modval.h b/include/modval.h
index 64d07ec..7b93ca4 100644
--- a/include/modval.h
+++ b/include/modval.h
@@ -657,7 +657,7 @@ extern Function_ptr *global;
 #define start_time ((time_t) *((time_t *)global[START_TIME]))
 #define idle_time() ((time_t) *((time_t *)global[IDLE_TIME]()))
 
-#define loading_global ((int) *((int *)global[LOADING_GLOBAL]))
+#define loading_global (*((int *)global[LOADING_GLOBAL]))
 #define target_window (*((Window **)global[TARGET_WINDOW]))
 #define current_window (*((Window **)global[CURRENT_WINDOW]))
 #define invisible_list (*((Window **)global[INVISIBLE_LIST]))
@@ -676,7 +676,7 @@ extern Function_ptr *global;
 #define status_update_flag ((int) *((int *)global[STATUS_UPDATE_FLAG]))
 #define tabkey_array (*((NickTab **)global[TABKEY_ARRAY]))
 #define autoreply_array (*((NickTab *)global[AUTOREPLY_ARRAY]))
-#define identd ((int) *((int *)global[IDENTD_SOCKET]))
+#define identd (*((int *)global[IDENTD_SOCKET]))
 #define doing_notice ((int) *((int *)global[DOING_NOTICE]))
 #define last_sent_msg_body (*((char **)global[LAST_SENT_MSG_BODY]))
 #define sent_nick (*((char **)global[SENT_NICK]))
diff --git a/include/struct.h b/include/struct.h
index 1e3b9d1..9a5cfd8 100644
--- a/include/struct.h
+++ b/include/struct.h
@@ -1064,7 +1064,6 @@ struct	timeval	time;
 	int	delete;
 }	TimerList;
 
-extern TimerList *PendingTimers;
 typedef struct nicktab_stru
 {
 	struct nicktab_stru *next;