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
This commit is contained in:
@@ -56,7 +56,6 @@
|
||||
extern CtcpEntryDll *dll_ctcp;
|
||||
|
||||
|
||||
extern char *ctcp_type[];
|
||||
extern int sed;
|
||||
extern int in_ctcp_flag;
|
||||
|
||||
|
||||
@@ -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]))
|
||||
|
||||
@@ -1064,7 +1064,6 @@ struct timeval time;
|
||||
int delete;
|
||||
} TimerList;
|
||||
|
||||
extern TimerList *PendingTimers;
|
||||
typedef struct nicktab_stru
|
||||
{
|
||||
struct nicktab_stru *next;
|
||||
|
||||
Reference in New Issue
Block a user