diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-10-02 19:45:26 -0700 |
| commit | 8e9e2b7d9e54744cee32b3724391bf0ad04e8aff (patch) | |
| tree | 6cafdc57bb8143306daf8ef8288d09754f39b451 /bitlbee.h | |
| parent | 88de0c96136313e553113f69cfc6ae544a5f5954 (diff) | |
| parent | 2af3e232ff468b288dd4e0dbdab1a17312d801c5 (diff) | |
Merging mainline, which includes a huge msnp13 merge.
Not 100% sure about the OpenSSL merge, should double check that but I'm
currently offline.
Diffstat (limited to 'bitlbee.h')
| -rw-r--r-- | bitlbee.h | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -136,7 +136,6 @@ #include "conf.h" #include "log.h" #include "ini.h" -#include "help.h" #include "query.h" #include "sock.h" #include "misc.h" @@ -146,7 +145,7 @@ typedef struct global { /* In forked mode, child processes store the fd of the IPC socket here. */ int listen_socket; gint listen_watch_source_id; - help_t *help; + struct help *help; char *conf_file; conf_t *conf; GList *storage; /* The first backend in the list will be used for saving */ |